diff --git a/CHANGELOG.md b/CHANGELOG.md
index 219c7b1726..ab14dc462e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,102 @@
+# [1.63.0](https://github.com/n8n-io/n8n/compare/n8n@1.62.1...n8n@1.63.0) (2024-10-09)
+
+
+### Bug Fixes
+
+* **Convert to File Node:** Convert to ICS start date defaults to now ([#11114](https://github.com/n8n-io/n8n/issues/11114)) ([1146c4e](https://github.com/n8n-io/n8n/commit/1146c4e98d8c85c15ac67fa1c3bfb731234531e3))
+* **core:** Allow loading nodes from multiple custom directories ([#11130](https://github.com/n8n-io/n8n/issues/11130)) ([1b84b0e](https://github.com/n8n-io/n8n/commit/1b84b0e5e7485d9f99d61a8ae3df49efadca0745))
+* **core:** Always set `startedAt` when executions start running ([#11098](https://github.com/n8n-io/n8n/issues/11098)) ([722f4a8](https://github.com/n8n-io/n8n/commit/722f4a8b771058800b992a482ad5f644b650960d))
+* **core:** Fix AI nodes not working with new partial execution flow ([#11055](https://github.com/n8n-io/n8n/issues/11055)) ([0eee5df](https://github.com/n8n-io/n8n/commit/0eee5dfd597817819dbe0463a63f671fde53432f))
+* **core:** Print errors that happen before the execution starts on the worker instead of just on the main instance ([#11099](https://github.com/n8n-io/n8n/issues/11099)) ([1d14557](https://github.com/n8n-io/n8n/commit/1d145574611661ecd9ab1a39d815c0ea915b9a1c))
+* **core:** Separate error handlers for main and worker ([#11091](https://github.com/n8n-io/n8n/issues/11091)) ([bb59cc7](https://github.com/n8n-io/n8n/commit/bb59cc71acc9e494e54abc8402d58db39e5a664e))
+* **editor:**  Shorten overflowing Node Label in InputLabels on hover and focus ([#11110](https://github.com/n8n-io/n8n/issues/11110)) ([87a0b68](https://github.com/n8n-io/n8n/commit/87a0b68f9009c1c776d937c6ca62096e88c95ed6))
+* **editor:** Add safety to prevent undefined errors ([#11104](https://github.com/n8n-io/n8n/issues/11104)) ([565b117](https://github.com/n8n-io/n8n/commit/565b117a52f8eac9202a1a62c43daf78b293dcf8))
+* **editor:** Fix design system form element sizing ([#11040](https://github.com/n8n-io/n8n/issues/11040)) ([67c3453](https://github.com/n8n-io/n8n/commit/67c3453885bc619fedc8338a6dd0d8d66dead931))
+* **editor:** Fix getInitials when Intl.Segmenter is not supported ([#11103](https://github.com/n8n-io/n8n/issues/11103)) ([7e8955b](https://github.com/n8n-io/n8n/commit/7e8955b322b1d2c84c0f479a5977484d8d5e3135))
+* **editor:** Fix schema view in AI tools ([#11089](https://github.com/n8n-io/n8n/issues/11089)) ([09cfdbd](https://github.com/n8n-io/n8n/commit/09cfdbd1817eba46c935308880fe9f95ded252b0))
+* **editor:** Respect tag querystring filter when listing workflows ([#11029](https://github.com/n8n-io/n8n/issues/11029)) ([59c5ff6](https://github.com/n8n-io/n8n/commit/59c5ff61354302562ba5a2340c66811afdd1523b))
+* **editor:** Show previous nodes autocomplete in AI tool nodes ([#11111](https://github.com/n8n-io/n8n/issues/11111)) ([8566b3a](https://github.com/n8n-io/n8n/commit/8566b3a99939f45ac263830eee30d0d4ade9305c))
+* **editor:** Update Usage page for Community+ edition ([#11074](https://github.com/n8n-io/n8n/issues/11074)) ([3974981](https://github.com/n8n-io/n8n/commit/3974981ea5c67f6f2bbb90a96b405d9d0cfa21af))
+* Fix transaction handling for 'revert' command ([#11145](https://github.com/n8n-io/n8n/issues/11145)) ([a782336](https://github.com/n8n-io/n8n/commit/a7823367f13c3dba0c339eaafaad0199bd524b13))
+* Forbid access to files outside source control work directory ([#11152](https://github.com/n8n-io/n8n/issues/11152)) ([606eedb](https://github.com/n8n-io/n8n/commit/606eedbf1b302e153bd13b7cef80847711e3a9ee))
+* **Gitlab Node:** Author name and email not being set ([#11077](https://github.com/n8n-io/n8n/issues/11077)) ([fce1233](https://github.com/n8n-io/n8n/commit/fce1233b58624d502c9c68f4b32a4bb7d76f1814))
+* Incorrect error message on calling wrong webhook method ([#11093](https://github.com/n8n-io/n8n/issues/11093)) ([d974b01](https://github.com/n8n-io/n8n/commit/d974b015d030c608158ff0c3fa3b7f4cbb8eadd3))
+* **n8n Form Trigger Node:** When clicking on a multiple choice label, the wrong one is selected ([#11059](https://github.com/n8n-io/n8n/issues/11059)) ([948edd1](https://github.com/n8n-io/n8n/commit/948edd1a047cf3dbddb3b0e9ec5de4bac3e97b9f))
+* **NASA Node:** Astronomy-Picture-Of-The-Day fails when it's YouTube video ([#11046](https://github.com/n8n-io/n8n/issues/11046)) ([c70969d](https://github.com/n8n-io/n8n/commit/c70969da2bcabeb33394073a69ccef208311461b))
+* **Postgres PGVector Store Node:** Fix filtering in retriever mode ([#11075](https://github.com/n8n-io/n8n/issues/11075)) ([dbd2ae1](https://github.com/n8n-io/n8n/commit/dbd2ae199506a24c2df4c983111a56f2adf63eee))
+* Show result of waiting execution on canvas after execution complete ([#10815](https://github.com/n8n-io/n8n/issues/10815)) ([90b4bfc](https://github.com/n8n-io/n8n/commit/90b4bfc472ef132d2280b175ae7410dfb8e549b2))
+* **Slack Node:** User id not sent correctly to API when updating user profile ([#11153](https://github.com/n8n-io/n8n/issues/11153)) ([ed9e61c](https://github.com/n8n-io/n8n/commit/ed9e61c46055d8e636a70c9c175d7d4ba596dd48))
+
+
+### Features
+
+* **core:** Introduce scoped logging ([#11127](https://github.com/n8n-io/n8n/issues/11127)) ([c68782c](https://github.com/n8n-io/n8n/commit/c68782c633b7ef6253ea705c5a222d4536491fd5))
+* **editor:**  Add navigation dropdown component ([#11047](https://github.com/n8n-io/n8n/issues/11047)) ([e081fd1](https://github.com/n8n-io/n8n/commit/e081fd1f0b5a0700017a8dc92f013f0abdbad319))
+* **editor:** Add route for create / edit / share credentials ([#11134](https://github.com/n8n-io/n8n/issues/11134)) ([5697de4](https://github.com/n8n-io/n8n/commit/5697de4429c5d94f25ce1bd14c84fb4266ea47a7))
+* **editor:** Community+ enrollment ([#10776](https://github.com/n8n-io/n8n/issues/10776)) ([92cf860](https://github.com/n8n-io/n8n/commit/92cf860f9f2994442facfddc758bc60f5cbec520))
+* Human in the loop ([#10675](https://github.com/n8n-io/n8n/issues/10675)) ([41228b4](https://github.com/n8n-io/n8n/commit/41228b472de11affc8cd0821284427c2c9e8b421))
+* **OpenAI Node:** Allow to specify thread ID for Assistant -> Message operation ([#11080](https://github.com/n8n-io/n8n/issues/11080)) ([6a2f9e7](https://github.com/n8n-io/n8n/commit/6a2f9e72959fb0e89006b69c31fbcee1ead1cde9))
+* Opt in to additional features on community for existing users ([#11166](https://github.com/n8n-io/n8n/issues/11166)) ([c2adfc8](https://github.com/n8n-io/n8n/commit/c2adfc85451c5103eaad068f882066fd36c4aebe))
+
+
+### Performance Improvements
+
+* **core:** Optimize worker healthchecks ([#11092](https://github.com/n8n-io/n8n/issues/11092)) ([19fb728](https://github.com/n8n-io/n8n/commit/19fb728da0839c57603e55da4e407715e6c5b081))
+
+
+
+## [1.62.1](https://github.com/n8n-io/n8n/compare/n8n@1.61.0...n8n@1.62.1) (2024-10-02)
+
+
+### Bug Fixes
+
+* **AI Agent Node:** Fix output parsing and empty tool input handling in AI Agent node ([#10970](https://github.com/n8n-io/n8n/issues/10970)) ([3a65bdc](https://github.com/n8n-io/n8n/commit/3a65bdc1f522932d463b4da0e67d29076887d06c))
+* **API:** Fix workflow project transfer ([#10651](https://github.com/n8n-io/n8n/issues/10651)) ([5f89e3a](https://github.com/n8n-io/n8n/commit/5f89e3a01c1bbb3589ff0464fd5bc991426f55dc))
+* **AwsS3 Node:** Fix search only using first input parameters ([#10998](https://github.com/n8n-io/n8n/issues/10998)) ([846cfde](https://github.com/n8n-io/n8n/commit/846cfde8dcaf7bf80f0a4ca7d65fc2a7b61d0e23))
+* **Chat Trigger Node:** Fix Allowed Origins paramter ([#11011](https://github.com/n8n-io/n8n/issues/11011)) ([b5f4afe](https://github.com/n8n-io/n8n/commit/b5f4afe12ec77f527080a4b7f812e12f9f73f8df))
+* **core:** Fix ownerless project case in statistics service ([#11051](https://github.com/n8n-io/n8n/issues/11051)) ([bdaadf1](https://github.com/n8n-io/n8n/commit/bdaadf10e058e2c0b1141289189d6526c030a2ca))
+* **core:** Handle Redis disconnects gracefully ([#11007](https://github.com/n8n-io/n8n/issues/11007)) ([cd91648](https://github.com/n8n-io/n8n/commit/cd916480c2d2b55f2215c72309dc432340fc3f30))
+* **core:** Prevent backend from loading duplicate copies of nodes packages ([#10979](https://github.com/n8n-io/n8n/issues/10979)) ([4584f22](https://github.com/n8n-io/n8n/commit/4584f22a9b16883779d8555cda309fd8bd113f6c))
+* **core:** Upgrade @n8n/typeorm to address a rare mutex release issue ([#10993](https://github.com/n8n-io/n8n/issues/10993)) ([2af0fbf](https://github.com/n8n-io/n8n/commit/2af0fbf52f0b404697f5148f81ad0035c9ffb6b9))
+* **editor:** Allow resources to move between personal and team projects ([#10683](https://github.com/n8n-io/n8n/issues/10683)) ([136d491](https://github.com/n8n-io/n8n/commit/136d49132567558b7d27069c857c0e0bfee70ce2))
+* **editor:** Color scheme for a markdown code blocks in dark mode ([#11008](https://github.com/n8n-io/n8n/issues/11008)) ([b20d2eb](https://github.com/n8n-io/n8n/commit/b20d2eb403f71fe1dc21c92df118adcebef51ffe))
+* **editor:** Fix filter execution by "Queued" ([#10987](https://github.com/n8n-io/n8n/issues/10987)) ([819d20f](https://github.com/n8n-io/n8n/commit/819d20fa2eee314b88a7ce1c4db632afac514704))
+* **editor:** Fix performance issue in credentials list ([#10988](https://github.com/n8n-io/n8n/issues/10988)) ([7073ec6](https://github.com/n8n-io/n8n/commit/7073ec6fe5384cc8c50dcb242212999a1fbc9041))
+* **editor:** Fix schema view pill highlighting ([#10936](https://github.com/n8n-io/n8n/issues/10936)) ([1b973dc](https://github.com/n8n-io/n8n/commit/1b973dcd8dbce598e6ada490fd48fad52f7b4f3a))
+* **editor:** Fix workflow executions list page redirection ([#10981](https://github.com/n8n-io/n8n/issues/10981)) ([fe7d060](https://github.com/n8n-io/n8n/commit/fe7d0605681dc963f5e5d1607f9d40c5173e0f9f))
+* **editor:** Format action names properly when action is not defined ([#11030](https://github.com/n8n-io/n8n/issues/11030)) ([9c43fb3](https://github.com/n8n-io/n8n/commit/9c43fb301d1ccb82e42f46833e19587289803cd3))
+* **Elasticsearch Node:** Fix issue with self signed certificates not working ([#10954](https://github.com/n8n-io/n8n/issues/10954)) ([79622b5](https://github.com/n8n-io/n8n/commit/79622b5f267f2a4a53f3eb48e228939d6e3a9caa))
+* **Facebook Lead Ads Trigger Node:** Pagination fix in RLC ([#10956](https://github.com/n8n-io/n8n/issues/10956)) ([6322372](https://github.com/n8n-io/n8n/commit/632237261087ada0177b67922f9f48ca02ef1d9e))
+* **Github Document Loader Node:** Pass through apiUrl from credentials & fix log output ([#11049](https://github.com/n8n-io/n8n/issues/11049)) ([a7af981](https://github.com/n8n-io/n8n/commit/a7af98183c47a5e215869c8269729b0fb2f318b5))
+* **Google Sheets Node:** Updating on row_number using automatic matching  ([#10940](https://github.com/n8n-io/n8n/issues/10940)) ([ed91495](https://github.com/n8n-io/n8n/commit/ed91495ebc1e09b89533ffef4b775eaa0139f365))
+* **HTTP Request Tool Node:** Remove default user agent header ([#10971](https://github.com/n8n-io/n8n/issues/10971)) ([5a99e93](https://github.com/n8n-io/n8n/commit/5a99e93f8d2c66d7dbcef382478badd63bc4a0b5))
+* **Postgres Node:** Falsy query parameters ignored ([#10960](https://github.com/n8n-io/n8n/issues/10960)) ([4a63cff](https://github.com/n8n-io/n8n/commit/4a63cff5ec722c810e3ff2bd7b0bb1e32f7f403b))
+* **Respond to Webhook Node:** Node does not work with Wait node ([#10992](https://github.com/n8n-io/n8n/issues/10992)) ([2df5a5b](https://github.com/n8n-io/n8n/commit/2df5a5b649f8ba3b747782d6d5045820aa74955d))
+* **RSS Feed Trigger Node:** Fix regression on missing timestamps ([#10991](https://github.com/n8n-io/n8n/issues/10991)) ([d2bc076](https://github.com/n8n-io/n8n/commit/d2bc0760e2b5c977fcc683f0a0281f099a9c538d))
+* **Supabase Node:** Fix issue with delete not always working ([#10952](https://github.com/n8n-io/n8n/issues/10952)) ([1944b46](https://github.com/n8n-io/n8n/commit/1944b46fd472bb59552b5fbf7783168a622a2bd2))
+* **Text Classifier Node:** Default system prompt template ([#11018](https://github.com/n8n-io/n8n/issues/11018)) ([77fec19](https://github.com/n8n-io/n8n/commit/77fec195d92e0fe23c60552a72e8c030cf7e5e5c))
+* **Todoist Node:** Fix listSearch filter bug in Todoist Node ([#10989](https://github.com/n8n-io/n8n/issues/10989)) ([c4b3272](https://github.com/n8n-io/n8n/commit/c4b327248d7aa1352e8d6acec5627ff406aea3d4))
+* **Todoist Node:** Make Section Name optional in Move Task operation ([#10732](https://github.com/n8n-io/n8n/issues/10732)) ([799006a](https://github.com/n8n-io/n8n/commit/799006a3cce6abe210469c839ae392d0c1aec486))
+
+
+### Features
+
+* Add more context to support chat ([#11014](https://github.com/n8n-io/n8n/issues/11014)) ([8a30f92](https://github.com/n8n-io/n8n/commit/8a30f92156d6a4fe73113bd3cdfb751b8c9ce4b4))
+* Add Sysdig API credentials for SecOps ([#7033](https://github.com/n8n-io/n8n/issues/7033)) ([a8d1a1e](https://github.com/n8n-io/n8n/commit/a8d1a1ea854fb2c69643b0a5738440b389121ca3))
+* **core:** Filter executions by project ID in internal API ([#10976](https://github.com/n8n-io/n8n/issues/10976)) ([06d749f](https://github.com/n8n-io/n8n/commit/06d749ffa7ced503141d8b07e22c47d971eb1623))
+* **core:** Implement Dynamic Parameters within regular nodes used as AI Tools ([#10862](https://github.com/n8n-io/n8n/issues/10862)) ([ef5b7cf](https://github.com/n8n-io/n8n/commit/ef5b7cf9b77b653111eb5b1d9de8116c9f6b9f92))
+* **editor:** Do not show error for remote options when credentials aren't specified ([#10944](https://github.com/n8n-io/n8n/issues/10944)) ([9fc3699](https://github.com/n8n-io/n8n/commit/9fc3699beb0c150909889ed17740a5cd9e0461c3))
+* **editor:** Enable drag and drop in code editors (Code/SQL/HTML) ([#10888](https://github.com/n8n-io/n8n/issues/10888)) ([af9e227](https://github.com/n8n-io/n8n/commit/af9e227ad4848995b9d82c72f814dbf9d1de506f))
+* **editor:** Overhaul document title management ([#10999](https://github.com/n8n-io/n8n/issues/10999)) ([bb28956](https://github.com/n8n-io/n8n/commit/bb2895689fb006897bc244271aca6f0bfa1839b9))
+* **editor:** Remove execution annotation feature flag ([#11020](https://github.com/n8n-io/n8n/issues/11020)) ([e7199db](https://github.com/n8n-io/n8n/commit/e7199dbfccdbdf1c4273f916e3006ca610c230e9))
+* **editor:** Support node-creator actions for vector store nodes ([#11032](https://github.com/n8n-io/n8n/issues/11032)) ([72b70d9](https://github.com/n8n-io/n8n/commit/72b70d9d98daeba654baf6785ff1ae234c73c977))
+* **Google BigQuery Node:** Return numeric values as integers ([#10943](https://github.com/n8n-io/n8n/issues/10943)) ([d7c1d24](https://github.com/n8n-io/n8n/commit/d7c1d24f74648740b2f425640909037ba06c5030))
+* **Invoice Ninja Node:** Add more query params to getAll requests ([#9238](https://github.com/n8n-io/n8n/issues/9238)) ([50b7238](https://github.com/n8n-io/n8n/commit/50b723836e70bbe405594f690b73057f9c33fbe4))
+* **Iterable Node:** Add support for EDC and USDC selection ([#10908](https://github.com/n8n-io/n8n/issues/10908)) ([0ca9c07](https://github.com/n8n-io/n8n/commit/0ca9c076ca51d313392e45c3b013f2e83aaea843))
+* **Question and Answer Chain Node:** Customize question and answer system prompt ([#10385](https://github.com/n8n-io/n8n/issues/10385)) ([08a27b3](https://github.com/n8n-io/n8n/commit/08a27b3148aac2282f64339ddc33ac7c90835d84))
+
+
+
 # [1.61.0](https://github.com/n8n-io/n8n/compare/n8n@1.60.0...n8n@1.61.0) (2024-09-25)
 
 
diff --git a/cypress/composables/ndv.ts b/cypress/composables/ndv.ts
index c3fab73f8c..5b3690e6a6 100644
--- a/cypress/composables/ndv.ts
+++ b/cypress/composables/ndv.ts
@@ -59,7 +59,7 @@ export function setCredentialByName(name: string) {
 
 export function clickCreateNewCredential() {
 	openCredentialSelect();
-	getCreateNewCredentialOption().click();
+	getCreateNewCredentialOption().click({ force: true });
 }
 
 export function clickGetBackToCanvas() {
diff --git a/cypress/composables/projects.ts b/cypress/composables/projects.ts
index 84379088d1..da9c6fcc65 100644
--- a/cypress/composables/projects.ts
+++ b/cypress/composables/projects.ts
@@ -32,8 +32,6 @@ export const addProjectMember = (email: string, role?: string) => {
 	}
 };
 export const getResourceMoveModal = () => cy.getByTestId('project-move-resource-modal');
-export const getResourceMoveConfirmModal = () =>
-	cy.getByTestId('project-move-resource-confirm-modal');
 export const getProjectMoveSelect = () => cy.getByTestId('project-move-resource-modal-select');
 
 export function createProject(name: string) {
diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index 8d37d5f2ad..394a35af18 100644
--- a/cypress/composables/workflow.ts
+++ b/cypress/composables/workflow.ts
@@ -144,6 +144,12 @@ export function addToolNodeToParent(nodeName: string, parentNodeName: string) {
 export function addOutputParserNodeToParent(nodeName: string, parentNodeName: string) {
 	addSupplementalNodeToParent(nodeName, 'ai_outputParser', parentNodeName);
 }
+export function addVectorStoreNodeToParent(nodeName: string, parentNodeName: string) {
+	addSupplementalNodeToParent(nodeName, 'ai_vectorStore', parentNodeName);
+}
+export function addRetrieverNodeToParent(nodeName: string, parentNodeName: string) {
+	addSupplementalNodeToParent(nodeName, 'ai_retriever', parentNodeName);
+}
 
 export function clickExecuteWorkflowButton() {
 	getExecuteWorkflowButton().click();
diff --git a/cypress/e2e/1-workflows.cy.ts b/cypress/e2e/1-workflows.cy.ts
index 6835346012..a6683bbee4 100644
--- a/cypress/e2e/1-workflows.cy.ts
+++ b/cypress/e2e/1-workflows.cy.ts
@@ -73,4 +73,28 @@ describe('Workflows', () => {
 
 		WorkflowsPage.getters.newWorkflowButtonCard().should('be.visible');
 	});
+
+	it('should respect tag querystring filter when listing workflows', () => {
+		WorkflowsPage.getters.newWorkflowButtonCard().click();
+
+		cy.createFixtureWorkflow('Test_workflow_2.json', getUniqueWorkflowName('My New Workflow'));
+
+		cy.visit(WorkflowsPage.url);
+
+		WorkflowsPage.getters.createWorkflowButton().click();
+
+		cy.createFixtureWorkflow('Test_workflow_1.json', 'Empty State Card Workflow');
+
+		cy.visit(WorkflowsPage.url);
+
+		WorkflowsPage.getters.workflowFilterButton().click();
+
+		WorkflowsPage.getters.workflowTagsDropdown().click();
+
+		WorkflowsPage.getters.workflowTagItem('some-tag-1').click();
+
+		cy.reload();
+
+		WorkflowsPage.getters.workflowCards().should('have.length', 1);
+	});
 });
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index 19256f3bf9..5788af171c 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -229,6 +229,35 @@ describe('Workflow Executions', () => {
 			cy.getByTestId('executions-filter-reset-button').should('be.visible').click();
 			executionsTab.getters.executionListItems().eq(11).should('be.visible');
 		});
+
+		it('should redirect back to editor after seeing a couple of execution using browser back button', () => {
+			createMockExecutions();
+			cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
+
+			executionsTab.actions.switchToExecutionsTab();
+
+			cy.wait(['@getExecutions']);
+			executionsTab.getters.workflowExecutionPreviewIframe().should('exist');
+
+			executionsTab.getters.executionListItems().eq(2).click();
+			executionsTab.getters.workflowExecutionPreviewIframe().should('exist');
+			executionsTab.getters.executionListItems().eq(4).click();
+			executionsTab.getters.workflowExecutionPreviewIframe().should('exist');
+			executionsTab.getters.executionListItems().eq(6).click();
+			executionsTab.getters.workflowExecutionPreviewIframe().should('exist');
+
+			cy.go('back');
+			executionsTab.getters.workflowExecutionPreviewIframe().should('exist');
+			cy.go('back');
+			executionsTab.getters.workflowExecutionPreviewIframe().should('exist');
+			cy.go('back');
+			executionsTab.getters.workflowExecutionPreviewIframe().should('exist');
+			cy.go('back');
+
+			cy.url().should('not.include', '/executions');
+			cy.url().should('include', '/workflow/');
+			workflowPage.getters.nodeViewRoot().should('be.visible');
+		});
 	});
 
 	describe('when new workflow is not saved', () => {
diff --git a/cypress/e2e/26-resource-locator.cy.ts b/cypress/e2e/26-resource-locator.cy.ts
index 6e431690ad..124e322c2b 100644
--- a/cypress/e2e/26-resource-locator.cy.ts
+++ b/cypress/e2e/26-resource-locator.cy.ts
@@ -65,7 +65,7 @@ describe('Resource Locator', () => {
 	});
 
 	it('should show appropriate errors when search filter is required', () => {
-		workflowPage.actions.addNodeToCanvas('Github', true, true, 'On Pull Request');
+		workflowPage.actions.addNodeToCanvas('Github', true, true, 'On pull request');
 		ndv.getters.resourceLocator('owner').should('be.visible');
 		ndv.getters.resourceLocatorInput('owner').click();
 		ndv.getters.resourceLocatorErrorMessage().should('contain', NO_CREDENTIALS_MESSAGE);
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index 59ed6bcb84..4e3bb583df 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -1,5 +1,11 @@
 import * as projects from '../composables/projects';
-import { INSTANCE_MEMBERS, MANUAL_TRIGGER_NODE_NAME, NOTION_NODE_NAME } from '../constants';
+import {
+	INSTANCE_ADMIN,
+	INSTANCE_MEMBERS,
+	INSTANCE_OWNER,
+	MANUAL_TRIGGER_NODE_NAME,
+	NOTION_NODE_NAME,
+} from '../constants';
 import {
 	WorkflowsPage,
 	WorkflowPage,
@@ -481,44 +487,15 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Next")')
+				.find('button:contains("Move workflow")')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
-				.first()
-				.should('contain.text', 'Project 1')
-				.click();
-			projects.getResourceMoveModal().find('button:contains("Next")').click();
-
-			projects
-				.getResourceMoveConfirmModal()
-				.should('be.visible')
-				.find('button:contains("Confirm")')
-				.should('be.disabled');
-
-			projects
-				.getResourceMoveConfirmModal()
-				.find('input[type="checkbox"]')
-				.first()
-				.parents('label')
-				.click();
-			projects
-				.getResourceMoveConfirmModal()
-				.find('button:contains("Confirm")')
-				.should('be.disabled');
-			projects
-				.getResourceMoveConfirmModal()
-				.find('input[type="checkbox"]')
-				.last()
-				.parents('label')
-				.click();
-			projects
-				.getResourceMoveConfirmModal()
-				.find('button:contains("Confirm")')
-				.should('not.be.disabled')
+				.should('have.length', 5)
+				.filter(':contains("Project 1")')
 				.click();
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
 
 			workflowsPage.getters
 				.workflowCards()
@@ -526,9 +503,77 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.filter(':contains("Owned by me")')
 				.should('not.exist');
 
-			// Move the credential from Project 1 to Project 2
+			// Move the workflow from Project 1 to Project 2
 			projects.getMenuItems().first().click();
 			workflowsPage.getters.workflowCards().should('have.length', 2);
+			workflowsPage.getters.workflowCardActions('Workflow in Home project').click();
+			workflowsPage.getters.workflowMoveButton().click();
+
+			projects
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move workflow")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(':contains("Project 2")')
+				.click();
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+
+			// Move the workflow from Project 2 to a member user
+			projects.getMenuItems().last().click();
+			workflowsPage.getters.workflowCards().should('have.length', 2);
+			workflowsPage.getters.workflowCardActions('Workflow in Home project').click();
+			workflowsPage.getters.workflowMoveButton().click();
+
+			projects
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move workflow")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(`:contains("${INSTANCE_MEMBERS[0].email}")`)
+				.click();
+
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			workflowsPage.getters.workflowCards().should('have.length', 1);
+
+			// Move the workflow from member user back to Home
+			projects.getHomeButton().click();
+			workflowsPage.getters
+				.workflowCards()
+				.should('have.length', 3)
+				.filter(':has(.n8n-badge:contains("Project"))')
+				.should('have.length', 2);
+			workflowsPage.getters.workflowCardActions('Workflow in Home project').click();
+			workflowsPage.getters.workflowMoveButton().click();
+
+			projects
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move workflow")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(`:contains("${INSTANCE_OWNER.email}")`)
+				.click();
+
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			workflowsPage.getters
+				.workflowCards()
+				.should('have.length', 3)
+				.filter(':contains("Owned by me")')
+				.should('have.length', 1);
+
+			// Move the credential from Project 1 to Project 2
+			projects.getMenuItems().first().click();
 			projects.getProjectTabCredentials().click();
 			credentialsPage.getters.credentialCards().should('have.length', 1);
 			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
@@ -537,48 +582,162 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Next")')
+				.find('button:contains("Move credential")')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 1)
-				.first()
-				.should('contain.text', 'Project 2')
+				.should('have.length', 5)
+				.filter(':contains("Project 2")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Next")').click();
+			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
 
-			projects
-				.getResourceMoveConfirmModal()
-				.should('be.visible')
-				.find('button:contains("Confirm")')
-				.should('be.disabled');
-
-			projects
-				.getResourceMoveConfirmModal()
-				.find('input[type="checkbox"]')
-				.first()
-				.parents('label')
-				.click();
-			projects
-				.getResourceMoveConfirmModal()
-				.find('button:contains("Confirm")')
-				.should('be.disabled');
-			projects
-				.getResourceMoveConfirmModal()
-				.find('input[type="checkbox"]')
-				.last()
-				.parents('label')
-				.click();
-			projects
-				.getResourceMoveConfirmModal()
-				.find('button:contains("Confirm")')
-				.should('not.be.disabled')
-				.click();
 			credentialsPage.getters.credentialCards().should('not.have.length');
+
+			// Move the credential from Project 2 to admin user
 			projects.getMenuItems().last().click();
 			projects.getProjectTabCredentials().click();
 			credentialsPage.getters.credentialCards().should('have.length', 2);
+
+			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
+			credentialsPage.getters.credentialMoveButton().click();
+
+			projects
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move credential")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(`:contains("${INSTANCE_ADMIN.email}")`)
+				.click();
+			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			credentialsPage.getters.credentialCards().should('have.length', 1);
+
+			// Move the credential from admin user back to instance owner
+			projects.getHomeButton().click();
+			projects.getProjectTabCredentials().click();
+			credentialsPage.getters.credentialCards().should('have.length', 3);
+
+			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
+			credentialsPage.getters.credentialMoveButton().click();
+
+			projects
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move credential")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(`:contains("${INSTANCE_OWNER.email}")`)
+				.click();
+			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+
+			credentialsPage.getters
+				.credentialCards()
+				.should('have.length', 3)
+				.filter(':contains("Owned by me")')
+				.should('have.length', 2);
+
+			// Move the credential from admin user back to its original project (Project 1)
+			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
+			credentialsPage.getters.credentialMoveButton().click();
+
+			projects
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move credential")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(':contains("Project 1")')
+				.click();
+			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+
+			projects.getMenuItems().first().click();
+			projects.getProjectTabCredentials().click();
+			credentialsPage.getters
+				.credentialCards()
+				.filter(':contains("Credential in Project 1")')
+				.should('have.length', 1);
+		});
+
+		it('should allow to change inaccessible credential when the workflow was moved to a team project', () => {
+			cy.signinAsOwner();
+			cy.visit(workflowsPage.url);
+
+			// Create a credential in the Home project
+			projects.getProjectTabCredentials().should('be.visible').click();
+			credentialsPage.getters.emptyListCreateCredentialButton().click();
+			projects.createCredential('Credential in Home project');
+
+			// Create a workflow in the Home project
+			projects.getHomeButton().click();
+			workflowsPage.getters.workflowCards().should('not.have.length');
+			workflowsPage.getters.newWorkflowButtonCard().click();
+			workflowsPage.getters.workflowCards().should('not.have.length');
+
+			workflowsPage.getters.newWorkflowButtonCard().click();
+			workflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+			workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
+			ndv.getters.backToCanvas().click();
+			workflowPage.actions.saveWorkflowOnButtonClick();
+
+			// Create a project and add a user to it
+			projects.createProject('Project 1');
+			projects.addProjectMember(INSTANCE_MEMBERS[0].email);
+			projects.getProjectSettingsSaveButton().click();
+
+			// Move the workflow from Home to Project 1
+			projects.getHomeButton().click();
+			workflowsPage.getters
+				.workflowCards()
+				.should('have.length', 1)
+				.filter(':contains("Owned by me")')
+				.should('exist');
+			workflowsPage.getters.workflowCardActions('My workflow').click();
+			workflowsPage.getters.workflowMoveButton().click();
+
+			projects
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move workflow")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 4)
+				.filter(':contains("Project 1")')
+				.click();
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+
+			workflowsPage.getters
+				.workflowCards()
+				.should('have.length', 1)
+				.filter(':contains("Owned by me")')
+				.should('not.exist');
+
+			//Log out with instance owner and log in with the member user
+			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();
+
+			// Open the moved workflow
+			workflowsPage.getters.workflowCards().should('have.length', 1);
+			workflowsPage.getters.workflowCards().first().click();
+
+			// Check if the credential can be changed
+			workflowPage.getters.canvasNodeByName(NOTION_NODE_NAME).should('be.visible').dblclick();
+			ndv.getters.credentialInput().find('input').should('be.enabled');
 		});
 
 		it('should handle viewer role', () => {
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 9dfe128322..a2cd5968d1 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,3 +1,9 @@
+import {
+	addNodeToCanvas,
+	addRetrieverNodeToParent,
+	addVectorStoreNodeToParent,
+	getNodeCreatorItems,
+} from '../composables/workflow';
 import { IF_NODE_NAME } from '../constants';
 import { NodeCreator } from '../pages/features/node-creator';
 import { NDV } from '../pages/ndv';
@@ -504,4 +510,38 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('gith');
 		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'GitHub');
 	});
+
+	it('should show vector stores actions', () => {
+		const actions = [
+			'Get ranked documents from vector store',
+			'Add documents to vector store',
+			'Retrieve documents for AI processing',
+		];
+
+		nodeCreatorFeature.actions.openNodeCreator();
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Vector Store');
+
+		getNodeCreatorItems().then((items) => {
+			const vectorStores = items.map((_i, el) => el.innerText);
+
+			// Loop over all vector stores and check if they have the three actions
+			vectorStores.each((_i, vectorStore) => {
+				nodeCreatorFeature.getters.getCreatorItem(vectorStore).click();
+				actions.forEach((action) => {
+					nodeCreatorFeature.getters.getCreatorItem(action).should('be.visible');
+				});
+				cy.realPress('ArrowLeft');
+			});
+		});
+	});
+
+	it('should add node directly for sub-connection', () => {
+		addNodeToCanvas('Question and Answer Chain', true);
+		addRetrieverNodeToParent('Vector Store Retriever', 'Question and Answer Chain');
+		cy.realPress('Escape');
+		addVectorStoreNodeToParent('In-Memory Vector Store', 'Vector Store Retriever');
+		cy.realPress('Escape');
+		WorkflowPage.getters.canvasNodes().should('have.length', 4);
+	});
 });
diff --git a/cypress/e2e/45-ai-assistant.cy.ts b/cypress/e2e/45-ai-assistant.cy.ts
index 6c69a97708..4fc1407bb9 100644
--- a/cypress/e2e/45-ai-assistant.cy.ts
+++ b/cypress/e2e/45-ai-assistant.cy.ts
@@ -78,11 +78,11 @@ describe('AI Assistant::enabled', () => {
 	});
 
 	it('should start chat session from node error view', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/simple_message_response.json',
+			fixture: 'aiAssistant/responses/simple_message_response.json',
 		}).as('chatRequest');
-		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
+		cy.createFixtureWorkflow('aiAssistant/workflows/test_workflow.json');
 		wf.actions.openNode('Stop and Error');
 		ndv.getters.nodeExecuteButton().click();
 		aiAssistant.getters.nodeErrorViewAssistantButton().click();
@@ -96,11 +96,11 @@ describe('AI Assistant::enabled', () => {
 	});
 
 	it('should render chat input correctly', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/simple_message_response.json',
+			fixture: 'aiAssistant/responses/simple_message_response.json',
 		}).as('chatRequest');
-		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
+		cy.createFixtureWorkflow('aiAssistant/workflows/test_workflow.json');
 		wf.actions.openNode('Stop and Error');
 		ndv.getters.nodeExecuteButton().click();
 		aiAssistant.getters.nodeErrorViewAssistantButton().click();
@@ -129,11 +129,11 @@ describe('AI Assistant::enabled', () => {
 	});
 
 	it('should render and handle quick replies', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/quick_reply_message_response.json',
+			fixture: 'aiAssistant/responses/quick_reply_message_response.json',
 		}).as('chatRequest');
-		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
+		cy.createFixtureWorkflow('aiAssistant/workflows/test_workflow.json');
 		wf.actions.openNode('Stop and Error');
 		ndv.getters.nodeExecuteButton().click();
 		aiAssistant.getters.nodeErrorViewAssistantButton().click();
@@ -146,18 +146,24 @@ describe('AI Assistant::enabled', () => {
 	});
 
 	it('should show quick replies when node is executed after new suggestion', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', (req) => {
+		cy.intercept('POST', '/rest/ai/chat', (req) => {
 			req.reply((res) => {
 				if (['init-error-helper', 'message'].includes(req.body.payload.type)) {
-					res.send({ statusCode: 200, fixture: 'aiAssistant/simple_message_response.json' });
+					res.send({
+						statusCode: 200,
+						fixture: 'aiAssistant/responses/simple_message_response.json',
+					});
 				} else if (req.body.payload.type === 'event') {
-					res.send({ statusCode: 200, fixture: 'aiAssistant/node_execution_error_response.json' });
+					res.send({
+						statusCode: 200,
+						fixture: 'aiAssistant/responses/node_execution_error_response.json',
+					});
 				} else {
 					res.send({ statusCode: 500 });
 				}
 			});
 		}).as('chatRequest');
-		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
+		cy.createFixtureWorkflow('aiAssistant/workflows/test_workflow.json');
 		wf.actions.openNode('Edit Fields');
 		ndv.getters.nodeExecuteButton().click();
 		aiAssistant.getters.nodeErrorViewAssistantButton().click();
@@ -172,16 +178,15 @@ describe('AI Assistant::enabled', () => {
 		aiAssistant.getters.quickReplies().should('not.exist');
 		ndv.getters.nodeExecuteButton().click();
 		// But after executing the node again, quick replies should be shown
-		aiAssistant.getters.chatMessagesAssistant().should('have.length', 4);
 		aiAssistant.getters.quickReplies().should('have.length', 2);
 	});
 
 	it('should warn before starting a new session', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/simple_message_response.json',
+			fixture: 'aiAssistant/responses/simple_message_response.json',
 		}).as('chatRequest');
-		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
+		cy.createFixtureWorkflow('aiAssistant/workflows/test_workflow.json');
 		wf.actions.openNode('Edit Fields');
 		ndv.getters.nodeExecuteButton().click();
 		aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true });
@@ -204,15 +209,15 @@ describe('AI Assistant::enabled', () => {
 	});
 
 	it('should apply code diff to code node', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/code_diff_suggestion_response.json',
+			fixture: 'aiAssistant/responses/code_diff_suggestion_response.json',
 		}).as('chatRequest');
-		cy.intercept('POST', '/rest/ai-assistant/chat/apply-suggestion', {
+		cy.intercept('POST', '/rest/ai/chat/apply-suggestion', {
 			statusCode: 200,
-			fixture: 'aiAssistant/apply_code_diff_response.json',
+			fixture: 'aiAssistant/responses/apply_code_diff_response.json',
 		}).as('applySuggestion');
-		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
+		cy.createFixtureWorkflow('aiAssistant/workflows/test_workflow.json');
 		wf.actions.openNode('Code');
 		ndv.getters.nodeExecuteButton().click();
 		aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true });
@@ -254,11 +259,11 @@ describe('AI Assistant::enabled', () => {
 	});
 
 	it('should end chat session when `end_session` event is received', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/end_session_response.json',
+			fixture: 'aiAssistant/responses/end_session_response.json',
 		}).as('chatRequest');
-		cy.createFixtureWorkflow('aiAssistant/test_workflow.json');
+		cy.createFixtureWorkflow('aiAssistant/workflows/test_workflow.json');
 		wf.actions.openNode('Stop and Error');
 		ndv.getters.nodeExecuteButton().click();
 		aiAssistant.getters.nodeErrorViewAssistantButton().click();
@@ -268,12 +273,15 @@ describe('AI Assistant::enabled', () => {
 	});
 
 	it('should reset session after it ended and sidebar is closed', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', (req) => {
+		cy.intercept('POST', '/rest/ai/chat', (req) => {
 			req.reply((res) => {
 				if (['init-support-chat'].includes(req.body.payload.type)) {
-					res.send({ statusCode: 200, fixture: 'aiAssistant/simple_message_response.json' });
+					res.send({
+						statusCode: 200,
+						fixture: 'aiAssistant/responses/simple_message_response.json',
+					});
 				} else {
-					res.send({ statusCode: 200, fixture: 'aiAssistant/end_session_response.json' });
+					res.send({ statusCode: 200, fixture: 'aiAssistant/responses/end_session_response.json' });
 				}
 			});
 		}).as('chatRequest');
@@ -296,9 +304,9 @@ describe('AI Assistant::enabled', () => {
 	});
 
 	it('Should not reset assistant session when workflow is saved', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/simple_message_response.json',
+			fixture: 'aiAssistant/responses/simple_message_response.json',
 		}).as('chatRequest');
 		wf.actions.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		aiAssistant.actions.openChat();
@@ -321,9 +329,9 @@ describe('AI Assistant Credential Help', () => {
 	});
 
 	it('should start credential help from node credential', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/simple_message_response.json',
+			fixture: 'aiAssistant/responses/simple_message_response.json',
 		}).as('chatRequest');
 		wf.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		wf.actions.addNodeToCanvas(GMAIL_NODE_NAME);
@@ -347,9 +355,9 @@ describe('AI Assistant Credential Help', () => {
 	});
 
 	it('should start credential help from credential list', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/simple_message_response.json',
+			fixture: 'aiAssistant/responses/simple_message_response.json',
 		}).as('chatRequest');
 
 		cy.visit(credentialsPage.url);
@@ -446,9 +454,9 @@ describe('General help', () => {
 	});
 
 	it('assistant returns code snippet', () => {
-		cy.intercept('POST', '/rest/ai-assistant/chat', {
+		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
-			fixture: 'aiAssistant/code_snippet_response.json',
+			fixture: 'aiAssistant/responses/code_snippet_response.json',
 		}).as('chatRequest');
 
 		aiAssistant.getters.askAssistantFloatingButton().should('be.visible');
@@ -492,4 +500,65 @@ describe('General help', () => {
 			);
 		aiAssistant.getters.codeSnippet().should('have.text', '{{$json.body.city}}');
 	});
+
+	it('should send current context to support chat', () => {
+		cy.createFixtureWorkflow('aiAssistant/workflows/simple_http_request_workflow.json');
+		cy.intercept('POST', '/rest/ai/chat', {
+			statusCode: 200,
+			fixture: 'aiAssistant/responses/simple_message_response.json',
+		}).as('chatRequest');
+
+		aiAssistant.getters.askAssistantFloatingButton().click();
+		aiAssistant.actions.sendMessage('What is wrong with this workflow?');
+
+		cy.wait('@chatRequest').then((interception) => {
+			const { body } = interception.request;
+			// Body should contain the current workflow context
+			expect(body.payload).to.have.property('context');
+			expect(body.payload.context).to.have.property('currentView');
+			expect(body.payload.context.currentView.name).to.equal('NodeViewExisting');
+			expect(body.payload.context).to.have.property('currentWorkflow');
+		});
+	});
+
+	it('should not send workflow context if nothing changed', () => {
+		cy.createFixtureWorkflow('aiAssistant/workflows/simple_http_request_workflow.json');
+		cy.intercept('POST', '/rest/ai/chat', {
+			statusCode: 200,
+			fixture: 'aiAssistant/responses/simple_message_response.json',
+		}).as('chatRequest');
+
+		aiAssistant.getters.askAssistantFloatingButton().click();
+		aiAssistant.actions.sendMessage('What is wrong with this workflow?');
+		cy.wait('@chatRequest');
+
+		// Send another message without changing workflow or executing any node
+		aiAssistant.actions.sendMessage('And now?');
+
+		cy.wait('@chatRequest').then((interception) => {
+			const { body } = interception.request;
+			// Workflow context should be empty
+			expect(body.payload).to.have.property('context');
+			expect(body.payload.context).not.to.have.property('currentWorkflow');
+		});
+
+		// Update http request node url
+		wf.actions.openNode('HTTP Request');
+		ndv.actions.typeIntoParameterInput('url', 'https://example.com');
+		ndv.actions.close();
+		// Also execute the workflow
+		wf.actions.executeWorkflow();
+
+		// Send another message
+		aiAssistant.actions.sendMessage('What about now?');
+		cy.wait('@chatRequest').then((interception) => {
+			const { body } = interception.request;
+			// Both workflow and execution context should be sent
+			expect(body.payload).to.have.property('context');
+			expect(body.payload.context).to.have.property('currentWorkflow');
+			expect(body.payload.context.currentWorkflow).not.to.be.empty;
+			expect(body.payload.context).to.have.property('executionData');
+			expect(body.payload.context.executionData).not.to.be.empty;
+		});
+	});
 });
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 4608b5eefc..a591d62895 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -674,6 +674,23 @@ describe('NDV', () => {
 		ndv.getters.parameterInput('operation').find('input').should('have.value', 'Delete');
 	});
 
+	it('Should show a notice when remote options cannot be fetched because of missing credentials', () => {
+		cy.intercept('POST', '/rest/dynamic-node-parameters/options', { statusCode: 403 }).as(
+			'parameterOptions',
+		);
+
+		workflowPage.actions.addInitialNodeToCanvas(NOTION_NODE_NAME, {
+			keepNdvOpen: true,
+			action: 'Update a database page',
+		});
+
+		ndv.actions.addItemToFixedCollection('propertiesUi');
+		ndv.getters
+			.parameterInput('key')
+			.find('input')
+			.should('have.value', 'Set up credential to see options');
+	});
+
 	it('Should show error state when remote options cannot be fetched', () => {
 		cy.intercept('POST', '/rest/dynamic-node-parameters/options', { statusCode: 500 }).as(
 			'parameterOptions',
@@ -684,6 +701,11 @@ describe('NDV', () => {
 			action: 'Update a database page',
 		});
 
+		clickCreateNewCredential();
+		setCredentialValues({
+			apiKey: 'sk_test_123',
+		});
+
 		ndv.actions.addItemToFixedCollection('propertiesUi');
 		ndv.getters
 			.parameterInput('key')
diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 5b422b4589..5a6182c25a 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -91,28 +91,12 @@ return []
 	});
 
 	describe('Ask AI', () => {
-		it('tab should display based on experiment', () => {
-			WorkflowPage.actions.visit();
-			cy.window().then((win) => {
-				win.featureFlags.override('011_ask_AI', 'control');
-				WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-				WorkflowPage.actions.addNodeToCanvas('Code');
-				WorkflowPage.actions.openNode('Code');
-
-				cy.getByTestId('code-node-tab-ai').should('not.exist');
-
-				ndv.actions.close();
-				win.featureFlags.override('011_ask_AI', undefined);
-				WorkflowPage.actions.openNode('Code');
-				cy.getByTestId('code-node-tab-ai').should('not.exist');
-			});
-		});
-
 		describe('Enabled', () => {
 			beforeEach(() => {
+				cy.enableFeature('askAi');
 				WorkflowPage.actions.visit();
-				cy.window().then((win) => {
-					win.featureFlags.override('011_ask_AI', 'gpt3');
+
+				cy.window().then(() => {
 					WorkflowPage.actions.addInitialNodeToCanvas('Manual');
 					WorkflowPage.actions.addNodeToCanvas('Code', true, true);
 				});
@@ -157,7 +141,7 @@ return []
 
 				cy.getByTestId('ask-ai-prompt-input').type(prompt);
 
-				cy.intercept('POST', '/rest/ask-ai', {
+				cy.intercept('POST', '/rest/ai/ask-ai', {
 					statusCode: 200,
 					body: {
 						data: {
@@ -169,9 +153,7 @@ return []
 				cy.getByTestId('ask-ai-cta').click();
 				const askAiReq = cy.wait('@ask-ai');
 
-				askAiReq
-					.its('request.body')
-					.should('have.keys', ['question', 'model', 'context', 'n8nVersion']);
+				askAiReq.its('request.body').should('have.keys', ['question', 'context', 'forNode']);
 
 				askAiReq.its('context').should('have.keys', ['schema', 'ndvPushRef', 'pushRef']);
 
@@ -195,7 +177,7 @@ return []
 				];
 
 				handledCodes.forEach(({ code, message }) => {
-					cy.intercept('POST', '/rest/ask-ai', {
+					cy.intercept('POST', '/rest/ai/ask-ai', {
 						statusCode: code,
 						status: code,
 					}).as('ask-ai');
diff --git a/cypress/fixtures/aiAssistant/apply_code_diff_response.json b/cypress/fixtures/aiAssistant/responses/apply_code_diff_response.json
similarity index 100%
rename from cypress/fixtures/aiAssistant/apply_code_diff_response.json
rename to cypress/fixtures/aiAssistant/responses/apply_code_diff_response.json
diff --git a/cypress/fixtures/aiAssistant/code_diff_suggestion_response.json b/cypress/fixtures/aiAssistant/responses/code_diff_suggestion_response.json
similarity index 100%
rename from cypress/fixtures/aiAssistant/code_diff_suggestion_response.json
rename to cypress/fixtures/aiAssistant/responses/code_diff_suggestion_response.json
diff --git a/cypress/fixtures/aiAssistant/code_snippet_response.json b/cypress/fixtures/aiAssistant/responses/code_snippet_response.json
similarity index 100%
rename from cypress/fixtures/aiAssistant/code_snippet_response.json
rename to cypress/fixtures/aiAssistant/responses/code_snippet_response.json
diff --git a/cypress/fixtures/aiAssistant/end_session_response.json b/cypress/fixtures/aiAssistant/responses/end_session_response.json
similarity index 100%
rename from cypress/fixtures/aiAssistant/end_session_response.json
rename to cypress/fixtures/aiAssistant/responses/end_session_response.json
diff --git a/cypress/fixtures/aiAssistant/node_execution_error_response.json b/cypress/fixtures/aiAssistant/responses/node_execution_error_response.json
similarity index 100%
rename from cypress/fixtures/aiAssistant/node_execution_error_response.json
rename to cypress/fixtures/aiAssistant/responses/node_execution_error_response.json
diff --git a/cypress/fixtures/aiAssistant/quick_reply_message_response.json b/cypress/fixtures/aiAssistant/responses/quick_reply_message_response.json
similarity index 100%
rename from cypress/fixtures/aiAssistant/quick_reply_message_response.json
rename to cypress/fixtures/aiAssistant/responses/quick_reply_message_response.json
diff --git a/cypress/fixtures/aiAssistant/simple_message_response.json b/cypress/fixtures/aiAssistant/responses/simple_message_response.json
similarity index 100%
rename from cypress/fixtures/aiAssistant/simple_message_response.json
rename to cypress/fixtures/aiAssistant/responses/simple_message_response.json
diff --git a/cypress/fixtures/aiAssistant/workflows/simple_http_request_workflow.json b/cypress/fixtures/aiAssistant/workflows/simple_http_request_workflow.json
new file mode 100644
index 0000000000..28a0ee5359
--- /dev/null
+++ b/cypress/fixtures/aiAssistant/workflows/simple_http_request_workflow.json
@@ -0,0 +1,35 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "298d3dc9-5e99-4b3f-919e-05fdcdfbe2d0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [360, 220]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "65c32346-e939-4ec7-88a9-1f9184e2258d",
+			"name": "HTTP Request",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.2,
+			"position": [580, 220]
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "HTTP Request",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/cypress/fixtures/aiAssistant/test_workflow.json b/cypress/fixtures/aiAssistant/workflows/test_workflow.json
similarity index 100%
rename from cypress/fixtures/aiAssistant/test_workflow.json
rename to cypress/fixtures/aiAssistant/workflows/test_workflow.json
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index b775deec6d..cae1fb47b0 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -156,7 +156,7 @@ export class NDV extends BasePage {
 			this.getters.nodeExecuteButton().first().click();
 		},
 		close: () => {
-			this.getters.backToCanvas().click();
+			this.getters.backToCanvas().click({ force: true });
 		},
 		openInlineExpressionEditor: () => {
 			cy.contains('Expression').invoke('show').click();
diff --git a/lefthook.yml b/lefthook.yml
index cc39a32495..aa17417824 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -8,7 +8,7 @@ pre-commit:
         - merge
         - rebase
     prettier_check:
-      glob: 'packages/**/*.{vue,yml,md}'
+      glob: 'packages/**/*.{vue,yml,md,css,scss}'
       run: ./node_modules/.bin/prettier --write --ignore-unknown --no-error-on-unmatched-pattern {staged_files}
       stage_fixed: true
       skip:
diff --git a/n8n.code-workspace b/n8n.code-workspace
deleted file mode 100644
index 8f4183e8f0..0000000000
--- a/n8n.code-workspace
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		}
-	]
-}
diff --git a/package.json b/package.json
index 8253d86dfd..ee888f53dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.61.0",
+  "version": "1.63.0",
   "private": true,
   "engines": {
     "node": ">=20.15",
@@ -15,7 +15,7 @@
     "build:frontend": "turbo run build:frontend",
     "build:nodes": "turbo run build:nodes",
     "typecheck": "turbo typecheck",
-    "dev": "turbo run dev --parallel --env-mode=loose --filter=!n8n-design-system --filter=!@n8n/chat",
+    "dev": "turbo run dev --parallel --env-mode=loose --filter=!n8n-design-system --filter=!@n8n/chat --filter=!@n8n/task-runner",
     "dev:ai": "turbo run dev --parallel --env-mode=loose --filter=@n8n/nodes-langchain --filter=n8n --filter=n8n-core",
     "clean": "turbo run clean --parallel",
     "reset": "node scripts/ensure-zx.mjs && zx scripts/reset.mjs",
@@ -59,7 +59,7 @@
     "ts-jest": "^29.1.1",
     "tsc-alias": "^1.8.7",
     "tsc-watch": "^6.0.4",
-    "turbo": "2.0.6",
+    "turbo": "2.1.2",
     "typescript": "*",
     "zx": "^8.1.4"
   },
@@ -69,14 +69,15 @@
     ],
     "overrides": {
       "@types/node": "^18.16.16",
-      "chokidar": "3.5.2",
-      "esbuild": "^0.20.2",
+      "chokidar": "^4.0.1",
+      "esbuild": "^0.24.0",
       "formidable": "3.5.1",
       "pug": "^3.0.3",
       "semver": "^7.5.4",
       "tslib": "^2.6.2",
       "tsconfig-paths": "^4.2.0",
       "typescript": "^5.6.2",
+      "vue-tsc": "^2.1.6",
       "ws": ">=8.17.1"
     },
     "patchedDependencies": {
diff --git a/packages/@n8n/api-types/package.json b/packages/@n8n/api-types/package.json
index ec2bf1bd32..e2614bcf68 100644
--- a/packages/@n8n/api-types/package.json
+++ b/packages/@n8n/api-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/api-types",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/api-types/src/dto/index.ts b/packages/@n8n/api-types/src/dto/index.ts
index 68c1972a46..41a55f050a 100644
--- a/packages/@n8n/api-types/src/dto/index.ts
+++ b/packages/@n8n/api-types/src/dto/index.ts
@@ -2,3 +2,4 @@ export { PasswordUpdateRequestDto } from './user/password-update-request.dto';
 export { RoleChangeRequestDto } from './user/role-change-request.dto';
 export { SettingsUpdateRequestDto } from './user/settings-update-request.dto';
 export { UserUpdateRequestDto } from './user/user-update-request.dto';
+export { CommunityRegisteredRequestDto } from './license/community-registered-request.dto';
diff --git a/packages/@n8n/api-types/src/dto/license/__tests__/community-registered-request.dto.test.ts b/packages/@n8n/api-types/src/dto/license/__tests__/community-registered-request.dto.test.ts
new file mode 100644
index 0000000000..84e583e63b
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/license/__tests__/community-registered-request.dto.test.ts
@@ -0,0 +1,27 @@
+import { CommunityRegisteredRequestDto } from '../community-registered-request.dto';
+
+describe('CommunityRegisteredRequestDto', () => {
+	it('should fail validation for missing email', () => {
+		const invalidRequest = {};
+
+		const result = CommunityRegisteredRequestDto.safeParse(invalidRequest);
+
+		expect(result.success).toBe(false);
+		expect(result.error?.issues[0]).toEqual(
+			expect.objectContaining({ message: 'Required', path: ['email'] }),
+		);
+	});
+
+	it('should fail validation for an invalid email', () => {
+		const invalidRequest = {
+			email: 'invalid-email',
+		};
+
+		const result = CommunityRegisteredRequestDto.safeParse(invalidRequest);
+
+		expect(result.success).toBe(false);
+		expect(result.error?.issues[0]).toEqual(
+			expect.objectContaining({ message: 'Invalid email', path: ['email'] }),
+		);
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/license/community-registered-request.dto.ts b/packages/@n8n/api-types/src/dto/license/community-registered-request.dto.ts
new file mode 100644
index 0000000000..9763787767
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/license/community-registered-request.dto.ts
@@ -0,0 +1,4 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class CommunityRegisteredRequestDto extends Z.class({ email: z.string().email() }) {}
diff --git a/packages/@n8n/api-types/src/frontend-settings.ts b/packages/@n8n/api-types/src/frontend-settings.ts
index d50408bc3c..5084344aeb 100644
--- a/packages/@n8n/api-types/src/frontend-settings.ts
+++ b/packages/@n8n/api-types/src/frontend-settings.ts
@@ -33,6 +33,7 @@ export interface FrontendSettings {
 	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
+	endpointWebhookWaiting: string;
 	saveDataErrorExecution: WorkflowSettings.SaveDataExecution;
 	saveDataSuccessExecution: WorkflowSettings.SaveDataExecution;
 	saveManualExecutions: boolean;
@@ -106,6 +107,9 @@ export interface FrontendSettings {
 	aiAssistant: {
 		enabled: boolean;
 	};
+	askAi: {
+		enabled: boolean;
+	};
 	deployment: {
 		type: string;
 	};
@@ -153,9 +157,6 @@ export interface FrontendSettings {
 	banners: {
 		dismissed: string[];
 	};
-	ai: {
-		enabled: boolean;
-	};
 	workflowHistory: {
 		pruneTime: number;
 		licensePruneTime: number;
diff --git a/packages/@n8n/api-types/src/scaling.ts b/packages/@n8n/api-types/src/scaling.ts
index 8e15f06804..f0c3627e84 100644
--- a/packages/@n8n/api-types/src/scaling.ts
+++ b/packages/@n8n/api-types/src/scaling.ts
@@ -11,7 +11,7 @@ export type RunningJobSummary = {
 };
 
 export type WorkerStatus = {
-	workerId: string;
+	senderId: string;
 	runningJobsSummary: RunningJobSummary[];
 	freeMem: number;
 	totalMem: number;
diff --git a/packages/@n8n/benchmark/package.json b/packages/@n8n/benchmark/package.json
index f0b11ddeb2..98edd1dabd 100644
--- a/packages/@n8n/benchmark/package.json
+++ b/packages/@n8n/benchmark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-benchmark",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Cli for running benchmark tests for n8n",
   "main": "dist/index",
   "scripts": {
diff --git a/packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.manifest.json b/packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.manifest.json
deleted file mode 100644
index 1d768f706e..0000000000
--- a/packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.manifest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"$schema": "../scenario.schema.json",
-	"name": "CodeNodeJsOnceForEach",
-	"description": "A JS Code Node that runs once for each item and adds, modifies and removes properties. The data of 5 items is generated using DebugHelper Node, and returned with RespondToWebhook Node.",
-	"scenarioData": { "workflowFiles": ["js-code-node-once-for-each.json"] },
-	"scriptPath": "js-code-node-once-for-each.script.js"
-}
diff --git a/packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.json b/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.json
similarity index 58%
rename from packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.json
rename to packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.json
index 7b89ffde96..d6f30ac5ea 100644
--- a/packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.json
+++ b/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.json
@@ -1,9 +1,31 @@
 {
 	"createdAt": "2024-08-06T12:19:51.268Z",
 	"updatedAt": "2024-08-06T12:20:45.000Z",
-	"name": "JS Code Node Once For Each",
+	"name": "JS Code Node",
 	"active": true,
 	"nodes": [
+		{
+			"parameters": {
+				"respondWith": "allIncomingItems",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.respondToWebhook",
+			"typeVersion": 1.1,
+			"position": [1280, 460],
+			"id": "0067e317-09b8-478a-8c50-e19b4c9e294c",
+			"name": "Respond to Webhook"
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "// Add new field\n$input.item.json.age = 10 + Math.floor(Math.random() * 30);\n// Mutate existing field\n$input.item.json.password = $input.item.json.password.split('').map(() => '*').join(\"\")\n// Remove field\ndelete $input.item.json.lastname\n// New object field\nconst emailParts = $input.item.json.email.split(\"@\")\n$input.item.json.emailData = {\n  user: emailParts[0],\n  domain: emailParts[1]\n}\n\nreturn $input.item;"
+			},
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [1040, 460],
+			"id": "56d751c0-0d30-43c3-89fa-bebf3a9d436f",
+			"name": "OnceForEachItemJSCode"
+		},
 		{
 			"parameters": {
 				"httpMethod": "POST",
@@ -13,68 +35,23 @@
 			},
 			"type": "n8n-nodes-base.webhook",
 			"typeVersion": 2,
-			"position": [0, 0],
-			"id": "849350b3-4212-4416-a462-1cf331157d37",
+			"position": [580, 460],
+			"id": "417d749d-156c-4ffe-86ea-336f702dc5da",
 			"name": "Webhook",
 			"webhookId": "34ca1895-ccf4-4a4a-8bb8-a042f5edb567"
 		},
 		{
 			"parameters": {
-				"respondWith": "allIncomingItems",
-				"options": {}
-			},
-			"type": "n8n-nodes-base.respondToWebhook",
-			"typeVersion": 1.1,
-			"position": [660, 0],
-			"id": "f0660aa1-8a65-490f-b5cd-f8d134070c13",
-			"name": "Respond to Webhook"
-		},
-		{
-			"parameters": {
-				"category": "randomData",
-				"randomDataCount": 5
-			},
-			"type": "n8n-nodes-base.debugHelper",
-			"typeVersion": 1,
-			"position": [220, 0],
-			"id": "50f1efe8-bd2d-4061-9f51-b38c0e3daeb2",
-			"name": "DebugHelper"
-		},
-		{
-			"parameters": {
-				"mode": "runOnceForEachItem",
-				"jsCode": "// Add new field\n$input.item.json.age = 10 + Math.floor(Math.random() * 30);\n// Mutate existing field\n$input.item.json.password = $input.item.json.password.split('').map(() => '*').join(\"\")\n// Remove field\ndelete $input.item.json.lastname\n// New object field\nconst emailParts = $input.item.json.email.split(\"@\")\n$input.item.json.emailData = {\n  user: emailParts[0],\n  domain: emailParts[1]\n}\n\nreturn $input.item;"
+				"jsCode": "const digits = '0123456789';\nconst uppercaseLetters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';\nconst lowercaseLetters = uppercaseLetters.toLowerCase();\nconst alphabet = [digits, uppercaseLetters, lowercaseLetters].join('').split('')\n\nconst randomInt = (min, max) => Math.floor(Math.random() * (max - min + 1)) + min;\nconst randomItem = (arr) => arr.at(randomInt(0, arr.length - 1))\nconst randomString = (len) => Array.from({ length: len }).map(() => randomItem(alphabet)).join('')\n\nconst randomUid = () => [8,4,4,4,8].map(len => randomString(len)).join(\"-\")\nconst randomEmail = () => `${randomString(8)}@${randomString(10)}.com`\n\nconst randomPerson = () => ({\n  uid: randomUid(),\n  email: randomEmail(),\n  firstname: randomString(5),\n  lastname: randomString(12),\n  password: randomString(10)\n})\n\nreturn Array.from({ length: 100 }).map(() => ({\n  json: randomPerson()\n}))"
 			},
+			"id": "c30db155-73ca-48b9-8860-c3fe7a0926fb",
+			"name": "Code",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 2,
-			"position": [440, 0],
-			"id": "f9f2f865-e228-403d-8e47-72308359e207",
-			"name": "OnceForEachItemJSCode"
+			"position": [820, 460]
 		}
 	],
 	"connections": {
-		"Webhook": {
-			"main": [
-				[
-					{
-						"node": "DebugHelper",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		},
-		"DebugHelper": {
-			"main": [
-				[
-					{
-						"node": "OnceForEachItemJSCode",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		},
 		"OnceForEachItemJSCode": {
 			"main": [
 				[
@@ -85,6 +62,28 @@
 					}
 				]
 			]
+		},
+		"Webhook": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "OnceForEachItemJSCode",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
 		}
 	},
 	"settings": { "executionOrder": "v1" },
diff --git a/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.manifest.json b/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.manifest.json
new file mode 100644
index 0000000000..8b0165baf7
--- /dev/null
+++ b/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.manifest.json
@@ -0,0 +1,7 @@
+{
+	"$schema": "../scenario.schema.json",
+	"name": "CodeNodeJs",
+	"description": "A JS Code Node that first generates 100 items and then runs once for each item and adds, modifies and removes properties. The data returned with RespondToWebhook Node.",
+	"scenarioData": { "workflowFiles": ["js-code-node.json"] },
+	"scriptPath": "js-code-node.script.js"
+}
diff --git a/packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.script.js b/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.script.js
similarity index 88%
rename from packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.script.js
rename to packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.script.js
index 11e8e87ac3..74cef4f441 100644
--- a/packages/@n8n/benchmark/scenarios/js-code-node-once-for-each/js-code-node-once-for-each.script.js
+++ b/packages/@n8n/benchmark/scenarios/js-code-node/js-code-node.script.js
@@ -12,7 +12,7 @@ export default function () {
 
 			try {
 				const body = JSON.parse(r.body);
-				return Array.isArray(body) ? body.length === 5 : false;
+				return Array.isArray(body) ? body.length === 100 : false;
 			} catch (error) {
 				console.error('Error parsing response body: ', error);
 				return false;
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
index 2ca26c79b3..3cc08227c1 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - ${MOCK_API_DATA_PATH}/mappings:/home/wiremock/mappings
 
   postgres:
-    image: postgres:16
+    image: postgres:16.4
     restart: always
     user: root:root
     environment:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
index 3298a47556..ca3ad9c23d 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - ${MOCK_API_DATA_PATH}/mappings:/home/wiremock/mappings
 
   redis:
-    image: redis:6-alpine
+    image: redis:6.2.14-alpine
     restart: always
     ports:
       - 6379:6379
@@ -17,7 +17,7 @@ services:
       timeout: 3s
 
   postgres:
-    image: postgres:16
+    image: postgres:16.4
     restart: always
     environment:
       - POSTGRES_DB=n8n
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
index 27590459d2..fe9e3a26c0 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - ${MOCK_API_DATA_PATH}/mappings:/home/wiremock/mappings
 
   redis:
-    image: redis:6-alpine
+    image: redis:6.2.14-alpine
     ports:
       - 6379:6379
     healthcheck:
@@ -16,7 +16,7 @@ services:
       timeout: 3s
 
   postgres:
-    image: postgres:16
+    image: postgres:16.4
     user: root:root
     restart: always
     environment:
diff --git a/packages/@n8n/benchmark/scripts/run-for-n8n-setup.mjs b/packages/@n8n/benchmark/scripts/run-for-n8n-setup.mjs
index d3389f1e7b..8c8ea5f6dd 100755
--- a/packages/@n8n/benchmark/scripts/run-for-n8n-setup.mjs
+++ b/packages/@n8n/benchmark/scripts/run-for-n8n-setup.mjs
@@ -105,9 +105,8 @@ async function main() {
 		console.error(error.message);
 		console.error('');
 		await printContainerStatus(dockerComposeClient);
-		console.error('');
-		await dumpLogs(dockerComposeClient);
 	} finally {
+		await dumpLogs(dockerComposeClient);
 		await dockerComposeClient.$('down');
 	}
 }
@@ -118,7 +117,7 @@ async function printContainerStatus(dockerComposeClient) {
 }
 
 async function dumpLogs(dockerComposeClient) {
-	console.error('Container logs:');
+	console.info('Container logs:');
 	await dockerComposeClient.$('logs');
 }
 
diff --git a/packages/@n8n/chat/README.md b/packages/@n8n/chat/README.md
index 0ed53a5774..6299c80d12 100644
--- a/packages/@n8n/chat/README.md
+++ b/packages/@n8n/chat/README.md
@@ -184,6 +184,16 @@ createChat({
 - **Type**: `string[]`
 - **Description**: The initial messages to be displayed in the Chat window.
 
+### `allowFileUploads`
+- **Type**: `Ref<boolean> | boolean`
+- **Default**: `false`
+- **Description**: Whether to allow file uploads in the chat. If set to `true`, users will be able to upload files through the chat interface.
+
+### `allowedFilesMimeTypes`
+- **Type**: `Ref<string> | string`
+- **Default**: `''`
+- **Description**: A comma-separated list of allowed MIME types for file uploads. Only applicable if `allowFileUploads` is set to `true`. If left empty, all file types are allowed. For example: `'image/*,application/pdf'`.
+
 ## Customization
 The Chat window is entirely customizable using CSS variables.
 
diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
index 0848422a05..24d6cf6f1c 100644
--- a/packages/@n8n/chat/package.json
+++ b/packages/@n8n/chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/chat",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "scripts": {
     "dev": "pnpm run storybook",
     "build": "pnpm build:vite && pnpm build:bundle",
@@ -50,7 +50,7 @@
     "unplugin-icons": "^0.19.0",
     "vite": "catalog:frontend",
     "vitest": "catalog:frontend",
-    "vite-plugin-dts": "^3.9.1",
+    "vite-plugin-dts": "^4.2.3",
     "vue-tsc": "catalog:frontend"
   },
   "files": [
diff --git a/packages/@n8n/chat/src/css/markdown.scss b/packages/@n8n/chat/src/css/markdown.scss
index 6d219bbe02..070e6d6a5f 100644
--- a/packages/@n8n/chat/src/css/markdown.scss
+++ b/packages/@n8n/chat/src/css/markdown.scss
@@ -1,4 +1,20 @@
-@import 'highlight.js/styles/github.css';
+@use 'sass:meta';
+
+@include meta.load-css('highlight.js/styles/github.css');
+
+@mixin hljs-dark-theme {
+	@include meta.load-css('highlight.js/styles/github-dark-dimmed.css');
+}
+
+body {
+	&[data-theme='dark'] {
+		@include hljs-dark-theme;
+	}
+
+	@media (prefers-color-scheme: dark) {
+		@include hljs-dark-theme;
+	}
+}
 
 // https://github.com/pxlrbt/markdown-css
 .chat-message-markdown {
@@ -561,7 +577,6 @@
 
 	kbd, /* different style for kbd? */
 	code {
-		background: #eee;
 		padding: 0.1em 0.25em;
 		border-radius: 0.2rem;
 		-webkit-box-decoration-break: clone;
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index e1ac104f04..10c8cbcf5b 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/config/src/configs/logging.config.ts b/packages/@n8n/config/src/configs/logging.config.ts
new file mode 100644
index 0000000000..c29bb6d5a8
--- /dev/null
+++ b/packages/@n8n/config/src/configs/logging.config.ts
@@ -0,0 +1,73 @@
+import { Config, Env, Nested } from '../decorators';
+import { StringArray } from '../utils';
+
+/**
+ * Scopes (areas of functionality) to filter logs by.
+ *
+ * `executions` -> execution lifecycle
+ * `license` -> license SDK
+ * `scaling` -> scaling mode
+ */
+export const LOG_SCOPES = ['executions', 'license', 'scaling'] as const;
+
+export type LogScope = (typeof LOG_SCOPES)[number];
+
+@Config
+class FileLoggingConfig {
+	/**
+	 * Max number of log files to keep, or max number of days to keep logs for.
+	 * Once the limit is reached, the oldest log files will be rotated out.
+	 * If using days, append a `d` suffix. Only for `file` log output.
+	 *
+	 * @example `N8N_LOG_FILE_COUNT_MAX=7` will keep at most 7 files.
+	 * @example `N8N_LOG_FILE_COUNT_MAX=7d` will keep at most 7 days worth of files.
+	 */
+	@Env('N8N_LOG_FILE_COUNT_MAX')
+	fileCountMax: number = 100;
+
+	/** Max size (in MiB) for each log file. Only for `file` log output. */
+	@Env('N8N_LOG_FILE_SIZE_MAX')
+	fileSizeMax: number = 16;
+
+	/** Location of the log files inside `~/.n8n`. Only for `file` log output. */
+	@Env('N8N_LOG_FILE_LOCATION')
+	location: string = 'logs/n8n.log';
+}
+
+@Config
+export class LoggingConfig {
+	/**
+	 * Minimum level of logs to output. Logs with this or higher level will be output;
+	 * logs with lower levels will not. Exception: `silent` disables all logging.
+	 *
+	 * @example `N8N_LOG_LEVEL=info` will output `error`, `warn` and `info` logs, but not `debug`.
+	 */
+	@Env('N8N_LOG_LEVEL')
+	level: 'error' | 'warn' | 'info' | 'debug' | 'silent' = 'info';
+
+	/**
+	 * Where to output logs to. Options are: `console` or `file` or both in a comma separated list.
+	 *
+	 * @example `N8N_LOG_OUTPUT=console,file` will output to both console and file.
+	 */
+	@Env('N8N_LOG_OUTPUT')
+	outputs: StringArray<'console' | 'file'> = ['console'];
+
+	@Nested
+	file: FileLoggingConfig;
+
+	/**
+	 * Scopes to filter logs by. Nothing is filtered by default.
+	 *
+	 * Currently supported log scopes:
+	 * - `executions`
+	 * - `license`
+	 * - `scaling`
+	 *
+	 * @example
+	 * `N8N_LOG_SCOPES=license`
+	 * `N8N_LOG_SCOPES=license,executions`
+	 */
+	@Env('N8N_LOG_SCOPES')
+	scopes: StringArray<LogScope> = [];
+}
diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
new file mode 100644
index 0000000000..e7335e8827
--- /dev/null
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -0,0 +1,22 @@
+import { Config, Env } from '../decorators';
+
+@Config
+export class TaskRunnersConfig {
+	// Defaults to true for now
+	@Env('N8N_RUNNERS_DISABLED')
+	disabled: boolean = true;
+
+	@Env('N8N_RUNNERS_PATH')
+	path: string = '/runners';
+
+	@Env('N8N_RUNNERS_AUTH_TOKEN')
+	authToken: string = '';
+
+	/** IP address task runners server should listen on */
+	@Env('N8N_RUNNERS_SERVER_PORT')
+	port: number = 5679;
+
+	/** IP address task runners server should listen on */
+	@Env('N8N_RUNNERS_SERVER_LISTEN_ADDRESS')
+	listen_address: string = '127.0.0.1';
+}
diff --git a/packages/@n8n/config/src/configs/scaling-mode.config.ts b/packages/@n8n/config/src/configs/scaling-mode.config.ts
index 750de77b07..05ee6b4841 100644
--- a/packages/@n8n/config/src/configs/scaling-mode.config.ts
+++ b/packages/@n8n/config/src/configs/scaling-mode.config.ts
@@ -2,13 +2,21 @@ import { Config, Env, Nested } from '../decorators';
 
 @Config
 class HealthConfig {
-	/** Whether to enable the worker health check endpoint `/healthz`. */
+	/**
+	 * Whether to enable the worker health check endpoints:
+	 * - `/healthz` (worker alive)
+	 * - `/healthz/readiness` (worker connected to migrated database and connected to Redis)
+	 */
 	@Env('QUEUE_HEALTH_CHECK_ACTIVE')
 	active: boolean = false;
 
-	/** Port for worker to respond to health checks requests on, if enabled. */
+	/** Port for worker server to listen on. */
 	@Env('QUEUE_HEALTH_CHECK_PORT')
 	port: number = 5678;
+
+	/** IP address for worker server to listen on. */
+	@Env('N8N_WORKER_SERVER_ADDRESS')
+	address: string = '0.0.0.0';
 }
 
 @Config
diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index 5098093db4..9044ffa0fa 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -5,8 +5,11 @@ import { EndpointsConfig } from './configs/endpoints.config';
 import { EventBusConfig } from './configs/event-bus.config';
 import { ExternalSecretsConfig } from './configs/external-secrets.config';
 import { ExternalStorageConfig } from './configs/external-storage.config';
+import { LoggingConfig } from './configs/logging.config';
 import { NodesConfig } from './configs/nodes.config';
 import { PublicApiConfig } from './configs/public-api.config';
+import { TaskRunnersConfig } from './configs/runners.config';
+export { TaskRunnersConfig } from './configs/runners.config';
 import { ScalingModeConfig } from './configs/scaling-mode.config';
 import { SentryConfig } from './configs/sentry.config';
 import { TemplatesConfig } from './configs/templates.config';
@@ -15,6 +18,9 @@ import { VersionNotificationsConfig } from './configs/version-notifications.conf
 import { WorkflowsConfig } from './configs/workflows.config';
 import { Config, Env, Nested } from './decorators';
 
+export { LOG_SCOPES } from './configs/logging.config';
+export type { LogScope } from './configs/logging.config';
+
 @Config
 export class GlobalConfig {
 	@Nested
@@ -81,4 +87,10 @@ export class GlobalConfig {
 
 	@Nested
 	queue: ScalingModeConfig;
+
+	@Nested
+	logging: LoggingConfig;
+
+	@Nested
+	taskRunners: TaskRunnersConfig;
 }
diff --git a/packages/@n8n/config/src/utils.ts b/packages/@n8n/config/src/utils.ts
new file mode 100644
index 0000000000..c90fcb8266
--- /dev/null
+++ b/packages/@n8n/config/src/utils.ts
@@ -0,0 +1,7 @@
+export class StringArray<T extends string> extends Array<T> {
+	constructor(str: string) {
+		super();
+		const parsed = str.split(',') as StringArray<T>;
+		return parsed.every((i) => typeof i === 'string') ? parsed : [];
+	}
+}
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index 11fd97a5db..301022ca3e 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -198,6 +198,7 @@ describe('GlobalConfig', () => {
 			health: {
 				active: false,
 				port: 5678,
+				address: '0.0.0.0',
 			},
 			bull: {
 				redis: {
@@ -221,16 +222,32 @@ describe('GlobalConfig', () => {
 				},
 			},
 		},
+		taskRunners: {
+			disabled: true,
+			path: '/runners',
+			authToken: '',
+			listen_address: '127.0.0.1',
+			port: 5679,
+		},
 		sentry: {
 			backendDsn: '',
 			frontendDsn: '',
 		},
+		logging: {
+			level: 'info',
+			outputs: ['console'],
+			file: {
+				fileCountMax: 100,
+				fileSizeMax: 16,
+				location: 'logs/n8n.log',
+			},
+			scopes: [],
+		},
 	};
 
 	it('should use all default values when no env variables are defined', () => {
 		process.env = {};
 		const config = Container.get(GlobalConfig);
-
 		expect(deepCopy(config)).toEqual(defaultConfig);
 		expect(mockFs.readFileSync).not.toHaveBeenCalled();
 	});
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 a6dc4a63f2..90952bac41 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
@@ -1,27 +1,28 @@
-import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
-
-import type { AgentAction, AgentFinish } from 'langchain/agents';
-import { AgentExecutor, createToolCallingAgent } from 'langchain/agents';
 import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import { HumanMessage } from '@langchain/core/messages';
+import type { BaseMessage } from '@langchain/core/messages';
+import type { BaseOutputParser, StructuredOutputParser } from '@langchain/core/output_parsers';
 import type { BaseMessagePromptTemplateLike } from '@langchain/core/prompts';
 import { ChatPromptTemplate } from '@langchain/core/prompts';
-import { omit } from 'lodash';
+import { RunnableSequence } from '@langchain/core/runnables';
 import type { Tool } from '@langchain/core/tools';
 import { DynamicStructuredTool } from '@langchain/core/tools';
+import type { AgentAction, AgentFinish } from 'langchain/agents';
+import { AgentExecutor, createToolCallingAgent } from 'langchain/agents';
+import { OutputFixingParser } from 'langchain/output_parsers';
+import { omit } from 'lodash';
+import { BINARY_ENCODING, jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import type { ZodObject } from 'zod';
 import { z } from 'zod';
-import type { BaseOutputParser, StructuredOutputParser } from '@langchain/core/output_parsers';
-import { OutputFixingParser } from 'langchain/output_parsers';
-import { HumanMessage } from '@langchain/core/messages';
-import { RunnableSequence } from '@langchain/core/runnables';
+
+import { SYSTEM_MESSAGE } from './prompt';
 import {
 	isChatInstance,
 	getPromptInputByType,
 	getOptionalOutputParsers,
 	getConnectedTools,
 } from '../../../../../utils/helpers';
-import { SYSTEM_MESSAGE } from './prompt';
 
 function getOutputParserSchema(outputParser: BaseOutputParser): ZodObject<any, any, any, any> {
 	const parserType = outputParser.lc_namespace[outputParser.lc_namespace.length - 1];
@@ -74,6 +75,39 @@ async function extractBinaryMessages(ctx: IExecuteFunctions) {
 		content: [...binaryMessages],
 	});
 }
+/**
+ * Fixes empty content messages in agent steps.
+ *
+ * This function is necessary when using RunnableSequence.from in LangChain.
+ * If a tool doesn't have any arguments, LangChain returns input: '' (empty string).
+ * This can throw an error for some providers (like Anthropic) which expect the input to always be an object.
+ * This function replaces empty string inputs with empty objects to prevent such errors.
+ *
+ * @param steps - The agent steps to fix
+ * @returns The fixed agent steps
+ */
+function fixEmptyContentMessage(steps: AgentFinish | AgentAction[]) {
+	if (!Array.isArray(steps)) return steps;
+
+	steps.forEach((step) => {
+		if ('messageLog' in step && step.messageLog !== undefined) {
+			if (Array.isArray(step.messageLog)) {
+				step.messageLog.forEach((message: BaseMessage) => {
+					if ('content' in message && Array.isArray(message.content)) {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+						(message.content as Array<{ input?: string | object }>).forEach((content) => {
+							if (content.input === '') {
+								content.input = {};
+							}
+						});
+					}
+				});
+			}
+		}
+	});
+
+	return steps;
+}
 
 export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	this.logger.debug('Executing Tools Agent');
@@ -156,6 +190,14 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 		// If the steps do not contain multiple outputs, return them as is
 		return agentFinishSteps;
 	}
+
+	// If memory is connected we need to stringify the returnValues so that it can be saved in the memory as a string
+	function handleParsedStepOutput(output: Record<string, unknown>) {
+		return {
+			returnValues: memory ? { output: JSON.stringify(output) } : output,
+			log: 'Final response formatted',
+		};
+	}
 	async function agentStepsParser(
 		steps: AgentFinish | AgentAction[],
 	): Promise<AgentFinish | AgentAction[]> {
@@ -168,24 +210,18 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 					unknown
 				>;
 
-				return {
-					returnValues,
-					log: 'Final response formatted',
-				};
+				return handleParsedStepOutput(returnValues);
 			}
 		}
-		// If the steps are an AgentFinish and the outputParser is defined it must mean that the LLM didn't use `format_final_response` tool so we will parse the output manually
+
+		// If the steps are an AgentFinish and the outputParser is defined it must mean that the LLM didn't use `format_final_response` tool so we will try to parse the output manually
 		if (outputParser && typeof steps === 'object' && (steps as AgentFinish).returnValues) {
 			const finalResponse = (steps as AgentFinish).returnValues;
 			const returnValues = (await outputParser.parse(finalResponse as unknown as string)) as Record<
 				string,
 				unknown
 			>;
-
-			return {
-				returnValues,
-				log: 'Final response formatted',
-			};
+			return handleParsedStepOutput(returnValues);
 		}
 		return handleAgentFinishOutput(steps);
 	}
@@ -233,7 +269,7 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 	});
 	agent.streamRunnable = false;
 
-	const runnableAgent = RunnableSequence.from([agent, agentStepsParser]);
+	const runnableAgent = RunnableSequence.from([agent, agentStepsParser, fixEmptyContentMessage]);
 
 	const executor = AgentExecutor.fromAgentAndTools({
 		agent: runnableAgent,
@@ -273,6 +309,13 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 					'IMPORTANT: Always call `format_final_response` to format your final response!',
 			});
 
+			if (memory && outputParser) {
+				const parsedOutput = jsonParse<{ output: Record<string, unknown> }>(
+					response.output as string,
+				);
+				response.output = parsedOutput?.output ?? parsedOutput;
+			}
+
 			returnData.push({
 				json: omit(
 					response,
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
index 8249cbd90c..dfbdb3e9d1 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
@@ -10,10 +10,21 @@ import {
 import { RetrievalQAChain } from 'langchain/chains';
 import type { BaseLanguageModel } from '@langchain/core/language_models/base';
 import type { BaseRetriever } from '@langchain/core/retrievers';
+import {
+	ChatPromptTemplate,
+	SystemMessagePromptTemplate,
+	HumanMessagePromptTemplate,
+	PromptTemplate,
+} from '@langchain/core/prompts';
 import { getTemplateNoticeField } from '../../../utils/sharedFields';
-import { getPromptInputByType } from '../../../utils/helpers';
+import { getPromptInputByType, isChatInstance } from '../../../utils/helpers';
 import { getTracingConfig } from '../../../utils/tracing';
 
+const SYSTEM_PROMPT_TEMPLATE = `Use the following pieces of context to answer the users question. 
+If you don't know the answer, just say that you don't know, don't try to make up an answer.
+----------------
+{context}`;
+
 export class ChainRetrievalQa implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Question and Answer Chain',
@@ -137,6 +148,26 @@ export class ChainRetrievalQa implements INodeType {
 					},
 				},
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				default: {},
+				placeholder: 'Add Option',
+				options: [
+					{
+						displayName: 'System Prompt Template',
+						name: 'systemPromptTemplate',
+						type: 'string',
+						default: SYSTEM_PROMPT_TEMPLATE,
+						description:
+							'Template string used for the system prompt. This should include the variable `{context}` for the provided context. For text completion models, you should also include the variable `{question}` for the user’s query.',
+						typeOptions: {
+							rows: 6,
+						},
+					},
+				],
+			},
 		],
 	};
 
@@ -154,7 +185,6 @@ export class ChainRetrievalQa implements INodeType {
 		)) as BaseRetriever;
 
 		const items = this.getInputData();
-		const chain = RetrievalQAChain.fromLLM(model, retriever);
 
 		const returnData: INodeExecutionData[] = [];
 
@@ -178,6 +208,35 @@ export class ChainRetrievalQa implements INodeType {
 					throw new NodeOperationError(this.getNode(), 'The ‘query‘ parameter is empty.');
 				}
 
+				const options = this.getNodeParameter('options', itemIndex, {}) as {
+					systemPromptTemplate?: string;
+				};
+
+				const chainParameters = {} as {
+					prompt?: PromptTemplate | ChatPromptTemplate;
+				};
+
+				if (options.systemPromptTemplate !== undefined) {
+					if (isChatInstance(model)) {
+						const messages = [
+							SystemMessagePromptTemplate.fromTemplate(options.systemPromptTemplate),
+							HumanMessagePromptTemplate.fromTemplate('{question}'),
+						];
+						const chatPromptTemplate = ChatPromptTemplate.fromMessages(messages);
+
+						chainParameters.prompt = chatPromptTemplate;
+					} else {
+						const completionPromptTemplate = new PromptTemplate({
+							template: options.systemPromptTemplate,
+							inputVariables: ['context', 'question'],
+						});
+
+						chainParameters.prompt = completionPromptTemplate;
+					}
+				}
+
+				const chain = RetrievalQAChain.fromLLM(model, retriever, chainParameters);
+
 				const response = await chain.withConfig(getTracingConfig(this)).invoke({ query });
 				returnData.push({ json: { response } });
 			} catch (error) {
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
index 0399fc2d5a..7ccfddc5e4 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
@@ -262,7 +262,7 @@ export class InformationExtractor implements INodeType {
 			}
 
 			const zodSchemaSandbox = getSandboxWithZod(this, jsonSchema, 0);
-			const zodSchema = (await zodSchemaSandbox.runCode()) as z.ZodSchema<object>;
+			const zodSchema = await zodSchemaSandbox.runCode<z.ZodSchema<object>>();
 
 			parser = OutputFixingParser.fromLLM(llm, StructuredOutputParser.fromZodSchema(zodSchema));
 		}
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 3c0740664c..7afc317c37 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
@@ -1,3 +1,8 @@
+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 { NodeOperationError, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -6,14 +11,8 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
-import { NodeConnectionType } 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 SYSTEM_PROMPT_TEMPLATE =
@@ -172,11 +171,15 @@ export class TextClassifier implements INodeType {
 			0,
 		)) as BaseLanguageModel;
 
-		const categories = this.getNodeParameter('categories.categories', 0) as Array<{
+		const categories = this.getNodeParameter('categories.categories', 0, []) as Array<{
 			category: string;
 			description: string;
 		}>;
 
+		if (categories.length === 0) {
+			throw new NodeOperationError(this.getNode(), 'At least one category must be defined');
+		}
+
 		const options = this.getNodeParameter('options', 0, {}) as {
 			multiClass: boolean;
 			fallback?: string;
@@ -229,6 +232,7 @@ export class TextClassifier implements INodeType {
 			const systemPromptTemplateOpt = this.getNodeParameter(
 				'options.systemPromptTemplate',
 				itemIdx,
+				SYSTEM_PROMPT_TEMPLATE,
 			) as string;
 			const systemPromptTemplate = SystemMessagePromptTemplate.fromTemplate(
 				`${systemPromptTemplateOpt ?? SYSTEM_PROMPT_TEMPLATE}
diff --git a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
index 085dec98c2..abe9b01530 100644
--- a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
@@ -107,7 +107,7 @@ function getSandbox(
 	}
 	// eslint-disable-next-line @typescript-eslint/unbound-method
 
-	const sandbox = new JavaScriptSandbox(context, code, itemIndex, this.helpers, {
+	const sandbox = new JavaScriptSandbox(context, code, this.helpers, {
 		resolver: vmResolver,
 	});
 
@@ -368,7 +368,7 @@ export class Code implements INodeType {
 		}
 
 		const sandbox = getSandbox.call(this, code.supplyData.code, { itemIndex });
-		const response = (await sandbox.runCode()) as Tool;
+		const response = await sandbox.runCode<Tool>();
 
 		return {
 			response: logWrapper(response, this),
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts
index 7123ebbc38..916f0e7159 100644
--- a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts
@@ -109,17 +109,22 @@ export class DocumentGithubLoader implements INodeType {
 			0,
 		)) as CharacterTextSplitter | undefined;
 
+		const { index } = this.addInputData(NodeConnectionType.AiDocument, [
+			[{ json: { repository, branch, ignorePaths, recursive } }],
+		]);
 		const docs = new GithubRepoLoader(repository, {
 			branch,
 			ignorePaths: (ignorePaths ?? '').split(',').map((p) => p.trim()),
 			recursive,
 			accessToken: (credentials.accessToken as string) || '',
+			apiUrl: credentials.server as string,
 		});
 
 		const loadedDocs = textSplitter
 			? await textSplitter.splitDocuments(await docs.load())
 			: await docs.load();
 
+		this.addOutputData(NodeConnectionType.AiDocument, index, [[{ json: { loadedDocs } }]]);
 		return {
 			response: logWrapper(loadedDocs, this),
 		};
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
index 027ce04e6e..6ce6bff76b 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
@@ -48,7 +48,7 @@ export class N8nStructuredOutputParser<T extends z.ZodTypeAny> extends Structure
 		sandboxedSchema: JavaScriptSandbox,
 		nodeVersion: number,
 	): Promise<StructuredOutputParser<z.ZodType<object, z.ZodTypeDef, object>>> {
-		const zodSchema = (await sandboxedSchema.runCode()) as z.ZodSchema<object>;
+		const zodSchema = await sandboxedSchema.runCode<z.ZodSchema<object>>();
 
 		let returnSchema: z.ZodSchema<object>;
 		if (nodeVersion === 1) {
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 df68fb0c6a..7980f5fa9d 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
@@ -199,9 +199,9 @@ export class ToolCode implements INodeType {
 
 			let sandbox: Sandbox;
 			if (language === 'javaScript') {
-				sandbox = new JavaScriptSandbox(context, code, index, this.helpers);
+				sandbox = new JavaScriptSandbox(context, code, this.helpers);
 			} else {
-				sandbox = new PythonSandbox(context, code, index, this.helpers);
+				sandbox = new PythonSandbox(context, code, this.helpers);
 			}
 
 			sandbox.on(
@@ -216,7 +216,7 @@ export class ToolCode implements INodeType {
 
 		const runFunction = async (query: string | IDataObject): Promise<string> => {
 			const sandbox = getSandbox(query, itemIndex);
-			return await (sandbox.runCode() as Promise<string>);
+			return await sandbox.runCode<string>();
 		};
 
 		const toolHandler = async (query: string | IDataObject): Promise<string> => {
@@ -274,7 +274,7 @@ export class ToolCode implements INodeType {
 						: jsonParse<JSONSchema7>(inputSchema);
 
 				const zodSchemaSandbox = getSandboxWithZod(this, jsonSchema, 0);
-				const zodSchema = (await zodSchemaSandbox.runCode()) as DynamicZodObject;
+				const zodSchema = await zodSchemaSandbox.runCode<DynamicZodObject>();
 
 				tool = new DynamicStructuredTool<typeof zodSchema>({
 					schema: zodSchema,
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 421e85e1b5..32f6be42e7 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
@@ -275,7 +275,11 @@ export class ToolHttpRequest implements INodeType {
 			method: this.getNodeParameter('method', itemIndex, 'GET') as IHttpRequestMethods,
 			url: this.getNodeParameter('url', itemIndex) as string,
 			qs: {},
-			headers: {},
+			headers: {
+				// FIXME: This is a workaround to prevent the node from sending a default User-Agent (`n8n`) when the header is not set.
+				//  Needs to be replaced with a proper fix after NODE-1777 is resolved
+				'User-Agent': undefined,
+			},
 			body: {},
 		};
 
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 0b00e17ac4..352a727d11 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
@@ -530,7 +530,7 @@ export class ToolWorkflow implements INodeType {
 						: jsonParse<JSONSchema7>(inputSchema);
 
 				const zodSchemaSandbox = getSandboxWithZod(this, jsonSchema, 0);
-				const zodSchema = (await zodSchemaSandbox.runCode()) as DynamicZodObject;
+				const zodSchema = await zodSchemaSandbox.runCode<DynamicZodObject>();
 
 				tool = new DynamicStructuredTool<typeof zodSchema>({
 					schema: zodSchema,
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
index 5c53a69006..489b4fe28b 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -1,4 +1,6 @@
-import { Node, NodeConnectionType } from 'n8n-workflow';
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import { pick } from 'lodash';
+import { Node, NodeConnectionType, commonCORSParameters } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IWebhookFunctions,
@@ -10,10 +12,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { pick } from 'lodash';
-import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
-import { createPage } from './templates';
 import { validateAuth } from './GenericFunctions';
+import { createPage } from './templates';
 import type { LoadPreviousSessionChatOption } from './types';
 
 const CHAT_TRIGGER_PATH_IDENTIFIER = 'chat';
@@ -56,7 +56,6 @@ export class ChatTrigger extends Node {
 				],
 			},
 		},
-		supportsCORS: true,
 		maxNodes: 1,
 		inputs: `={{ (() => {
 			if (!['hostedChat', 'webhook'].includes($parameter.mode)) {
@@ -241,6 +240,15 @@ export class ChatTrigger extends Node {
 				placeholder: 'Add Field',
 				default: {},
 				options: [
+					// CORS parameters are only valid for when chat is used in hosted or webhook mode
+					...commonCORSParameters.map((p) => ({
+						...p,
+						displayOptions: {
+							show: {
+								'/mode': ['hostedChat', 'webhook'],
+							},
+						},
+					})),
 					{
 						...allowFileUploadsOption,
 						displayOptions: {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
index 7e14eb4887..0c9a148bec 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
@@ -1,14 +1,16 @@
-import { type INodeProperties } from 'n8n-workflow';
 import {
 	PGVectorStore,
 	type DistanceStrategy,
 	type PGVectorStoreArgs,
 } from '@langchain/community/vectorstores/pgvector';
-import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/v2/transport';
+import type { EmbeddingsInterface } from '@langchain/core/embeddings';
 import type { PostgresNodeCredentials } from 'n8n-nodes-base/dist/nodes/Postgres/v2/helpers/interfaces';
+import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/v2/transport';
+import type { INodeProperties } from 'n8n-workflow';
 import type pg from 'pg';
-import { createVectorStoreNode } from '../shared/createVectorStoreNode';
+
 import { metadataFilterField } from '../../../utils/sharedFields';
+import { createVectorStoreNode } from '../shared/createVectorStoreNode';
 
 type CollectionOptions = {
 	useCollection?: boolean;
@@ -177,13 +179,46 @@ const retrieveFields: INodeProperties[] = [
 	},
 ];
 
+/**
+ * Extended PGVectorStore class to handle custom filtering.
+ * This wrapper is necessary because when used as a retriever,
+ * similaritySearchVectorWithScore should use this.filter instead of
+ * expecting it from the parameter
+ */
+class ExtendedPGVectorStore extends PGVectorStore {
+	static async initialize(
+		embeddings: EmbeddingsInterface,
+		args: PGVectorStoreArgs & { dimensions?: number },
+	): Promise<ExtendedPGVectorStore> {
+		const { dimensions, ...rest } = args;
+		const postgresqlVectorStore = new this(embeddings, rest);
+
+		await postgresqlVectorStore._initializeClient();
+		await postgresqlVectorStore.ensureTableInDatabase(dimensions);
+		if (postgresqlVectorStore.collectionTableName) {
+			await postgresqlVectorStore.ensureCollectionTableInDatabase();
+		}
+
+		return postgresqlVectorStore;
+	}
+
+	async similaritySearchVectorWithScore(
+		query: number[],
+		k: number,
+		filter?: PGVectorStore['FilterType'],
+	) {
+		const mergedFilter = { ...this.filter, ...filter };
+		return await super.similaritySearchVectorWithScore(query, k, mergedFilter);
+	}
+}
+
 export const VectorStorePGVector = createVectorStoreNode({
 	meta: {
 		description: 'Work with your data in Postgresql with the PGVector extension',
 		icon: 'file:postgres.svg',
 		displayName: 'Postgres PGVector Store',
 		docsUrl:
-			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoresupabase/',
+			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorepgvector/',
 		name: 'vectorStorePGVector',
 		credentials: [
 			{
@@ -236,7 +271,7 @@ export const VectorStorePGVector = createVectorStoreNode({
 			'cosine',
 		) as DistanceStrategy;
 
-		return await PGVectorStore.initialize(embeddings, config);
+		return await ExtendedPGVectorStore.initialize(embeddings, config);
 	},
 	async populateVectorStore(context, embeddings, documents, itemIndex) {
 		// NOTE: if you are to create the HNSW index before use, you need to consider moving the distanceStrategy field to
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
index 10ea879bdd..d487969073 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -88,25 +88,25 @@ function getOperationModeOptions(args: VectorStoreNodeConstructorArgs): INodePro
 			name: 'Get Many',
 			value: 'load',
 			description: 'Get many ranked documents from vector store for query',
-			action: 'Get many ranked documents from vector store for query',
+			action: 'Get ranked documents from vector store',
 		},
 		{
 			name: 'Insert Documents',
 			value: 'insert',
 			description: 'Insert documents into vector store',
-			action: 'Insert documents into vector store',
+			action: 'Add documents to vector store',
 		},
 		{
 			name: 'Retrieve Documents (For Agent/Chain)',
 			value: 'retrieve',
 			description: 'Retrieve documents from vector store to be used with AI nodes',
-			action: 'Retrieve documents from vector store to be used with AI nodes',
+			action: 'Retrieve documents for AI processing',
 		},
 		{
 			name: 'Update Documents',
 			value: 'update',
 			description: 'Update documents in vector store by ID',
-			action: 'Update documents in vector store by ID',
+			action: 'Update vector store documents',
 		},
 	];
 
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 3ec2e46eea..cf770e4057 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
@@ -1,30 +1,27 @@
+import type { BaseMessage } from '@langchain/core/messages';
 import { AgentExecutor } from 'langchain/agents';
-
-import { OpenAIAssistantRunnable } from 'langchain/experimental/openai_assistant';
 import type { OpenAIToolType } from 'langchain/dist/experimental/openai_assistant/schema';
-import { OpenAI as OpenAIClient } from 'openai';
-
-import {
-	ApplicationError,
-	NodeConnectionType,
-	NodeOperationError,
-	updateDisplayOptions,
-} from 'n8n-workflow';
+import { OpenAIAssistantRunnable } from 'langchain/experimental/openai_assistant';
+import type { BufferWindowMemory } from 'langchain/memory';
+import omit from 'lodash/omit';
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-
-import type { BufferWindowMemory } from 'langchain/memory';
-import omit from 'lodash/omit';
-import type { BaseMessage } from '@langchain/core/messages';
-import { formatToOpenAIAssistantTool } from '../../helpers/utils';
-import { assistantRLC } from '../descriptions';
+import {
+	ApplicationError,
+	NodeConnectionType,
+	NodeOperationError,
+	updateDisplayOptions,
+} from 'n8n-workflow';
+import { OpenAI as OpenAIClient } from 'openai';
 
 import { getConnectedTools } from '../../../../../utils/helpers';
 import { getTracingConfig } from '../../../../../utils/tracing';
+import { formatToOpenAIAssistantTool } from '../../helpers/utils';
+import { assistantRLC } from '../descriptions';
 
 const properties: INodeProperties[] = [
 	assistantRLC,
@@ -63,6 +60,46 @@ const properties: INodeProperties[] = [
 			},
 		},
 	},
+	{
+		displayName: 'Memory',
+		name: 'memory',
+		type: 'options',
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				name: 'Use memory connector',
+				value: 'connector',
+				description: 'Connect one of the supported memory nodes',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				name: 'Use thread ID',
+				value: 'threadId',
+				description: 'Specify the ID of the thread to continue',
+			},
+		],
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.6 } }],
+			},
+		},
+		default: 'connector',
+	},
+	{
+		displayName: 'Thread ID',
+		name: 'threadId',
+		type: 'string',
+		default: '',
+		placeholder: '',
+		description: 'The ID of the thread to continue, a new thread will be created if not specified',
+		hint: 'If the thread ID is empty or undefined a new thread will be created and included in the response',
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.6 } }],
+				memory: ['threadId'],
+			},
+		},
+	},
 	{
 		displayName: 'Connect your own custom n8n tools to this node on the canvas',
 		name: 'noticeTools',
@@ -201,9 +238,19 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 		tools: tools ?? [],
 	});
 
-	const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
-		| BufferWindowMemory
-		| undefined;
+	const useMemoryConnector =
+		nodeVersion >= 1.6 && this.getNodeParameter('memory', i) === 'connector';
+	const memory =
+		useMemoryConnector || nodeVersion < 1.6
+			? ((await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
+					| BufferWindowMemory
+					| undefined)
+			: undefined;
+
+	const threadId =
+		nodeVersion >= 1.6 && !useMemoryConnector
+			? (this.getNodeParameter('threadId', i) as string)
+			: undefined;
 
 	const chainValues: IDataObject = {
 		content: input,
@@ -231,6 +278,8 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 
 			chainValues.threadId = thread.id;
 		}
+	} else if (threadId) {
+		chainValues.threadId = threadId;
 	}
 
 	let filteredResponse: IDataObject = {};
@@ -257,7 +306,8 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 				tools: assistantTools,
 			});
 		}
-		filteredResponse = omit(response, ['signal', 'timeout']) as IDataObject;
+		// Remove configuration properties and runId added by Langchain that are not relevant to the user
+		filteredResponse = omit(response, ['signal', 'timeout', 'content', 'runId']) as IDataObject;
 	} catch (error) {
 		if (!(error instanceof ApplicationError)) {
 			throw new NodeOperationError(this.getNode(), error.message, { itemIndex: i });
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 47be9a9abc..231fdb4b77 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
@@ -278,7 +278,7 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 			for (const tool of externalTools ?? []) {
 				if (tool.name === functionName) {
 					const parsedArgs: { input: string } = jsonParse(functionArgs);
-					const functionInput = parsedArgs.input ?? functionArgs;
+					const functionInput = parsedArgs.input ?? parsedArgs ?? functionArgs;
 					functionResponse = await tool.invoke(functionInput);
 				}
 			}
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
index 79fda0c377..20d7bd471e 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
@@ -1,5 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { INodeTypeDescription } from 'n8n-workflow';
+import type { INodeInputConfiguration, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
 import * as assistant from './assistant';
@@ -42,13 +42,21 @@ const prettifyOperation = (resource: string, operation: string) => {
 	return `${capitalize(operation)} ${capitalize(resource)}`;
 };
 
-const configureNodeInputs = (resource: string, operation: string, hideTools: string) => {
+const configureNodeInputs = (
+	resource: string,
+	operation: string,
+	hideTools: string,
+	memory: string | undefined,
+) => {
 	if (resource === 'assistant' && operation === 'message') {
-		return [
+		const inputs: INodeInputConfiguration[] = [
 			{ type: NodeConnectionType.Main },
-			{ type: NodeConnectionType.AiMemory, displayName: 'Memory', maxConnections: 1 },
 			{ type: NodeConnectionType.AiTool, displayName: 'Tools' },
 		];
+		if (memory !== 'threadId') {
+			inputs.push({ type: NodeConnectionType.AiMemory, displayName: 'Memory', maxConnections: 1 });
+		}
+		return inputs;
 	}
 	if (resource === 'text' && operation === 'message') {
 		if (hideTools === 'hide') {
@@ -69,7 +77,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'openAi',
 	icon: { light: 'file:openAi.svg', dark: 'file:openAi.dark.svg' },
 	group: ['transform'],
-	version: [1, 1.1, 1.2, 1.3, 1.4, 1.5],
+	version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6],
 	subtitle: `={{(${prettifyOperation})($parameter.resource, $parameter.operation)}}`,
 	description: 'Message an assistant or GPT, analyze images, generate audio, etc.',
 	defaults: {
@@ -89,7 +97,7 @@ export const versionDescription: INodeTypeDescription = {
 			],
 		},
 	},
-	inputs: `={{(${configureNodeInputs})($parameter.resource, $parameter.operation, $parameter.hideTools)}}`,
+	inputs: `={{(${configureNodeInputs})($parameter.resource, $parameter.operation, $parameter.hideTools, $parameter.memory ?? undefined)}}`,
 	outputs: [NodeConnectionType.Main],
 	credentials: [
 		{
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index ec7001286d..4df337ed52 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.61.0",
+  "version": "1.63.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -124,18 +124,20 @@
     "@types/cheerio": "^0.22.15",
     "@types/html-to-text": "^9.0.1",
     "@types/json-schema": "^7.0.15",
+    "@types/pg": "^8.11.6",
     "@types/temp": "^0.9.1",
     "n8n-core": "workspace:*"
   },
   "dependencies": {
-    "@getzep/zep-cloud": "1.0.11",
+    "@aws-sdk/client-sso-oidc": "3.666.0",
+    "@getzep/zep-cloud": "1.0.12",
     "@getzep/zep-js": "0.9.0",
     "@google-ai/generativelanguage": "2.6.0",
     "@google-cloud/resource-manager": "5.3.0",
     "@google/generative-ai": "0.19.0",
     "@huggingface/inference": "2.8.0",
     "@langchain/anthropic": "0.3.1",
-    "@langchain/aws": "^0.1.0",
+    "@langchain/aws": "0.1.0",
     "@langchain/cohere": "0.3.0",
     "@langchain/community": "0.3.2",
     "@langchain/core": "catalog:",
@@ -149,23 +151,22 @@
     "@langchain/qdrant": "0.1.0",
     "@langchain/redis": "0.1.0",
     "@langchain/textsplitters": "0.1.0",
-    "@mozilla/readability": "^0.5.0",
-    "@n8n/typeorm": "0.3.20-10",
+    "@mozilla/readability": "0.5.0",
+    "@n8n/typeorm": "0.3.20-12",
     "@n8n/vm2": "3.9.25",
     "@pinecone-database/pinecone": "3.0.3",
     "@qdrant/js-client-rest": "1.11.0",
     "@supabase/supabase-js": "2.45.4",
-    "@types/pg": "^8.11.6",
-    "@xata.io/client": "0.30.0",
+    "@xata.io/client": "0.28.4",
     "basic-auth": "catalog:",
-    "cheerio": "1.0.0-rc.12",
+    "cheerio": "1.0.0",
     "cohere-ai": "7.13.2",
     "d3-dsv": "2.0.0",
     "epub2": "3.0.2",
     "form-data": "catalog:",
     "generate-schema": "2.6.0",
     "html-to-text": "9.0.5",
-    "jsdom": "^23.0.1",
+    "jsdom": "23.0.1",
     "json-schema-to-zod": "2.1.0",
     "langchain": "0.3.2",
     "lodash": "catalog:",
diff --git a/packages/@n8n/nodes-langchain/utils/schemaParsing.ts b/packages/@n8n/nodes-langchain/utils/schemaParsing.ts
index 8d5f61153d..0591483e2c 100644
--- a/packages/@n8n/nodes-langchain/utils/schemaParsing.ts
+++ b/packages/@n8n/nodes-langchain/utils/schemaParsing.ts
@@ -57,7 +57,6 @@ export function getSandboxWithZod(ctx: IExecuteFunctions, schema: JSONSchema7, i
 			const itemSchema = new Function('z', 'return (' + zodSchema + ')')(z)
 			return itemSchema
 		`,
-		itemIndex,
 		ctx.helpers,
 		{ resolver: vmResolver },
 	);
diff --git a/packages/@n8n/storybook/package.json b/packages/@n8n/storybook/package.json
index 7a08f9ce51..7b2230a36b 100644
--- a/packages/@n8n/storybook/package.json
+++ b/packages/@n8n/storybook/package.json
@@ -4,18 +4,18 @@
   "version": "0.0.1",
   "devDependencies": {
     "@chromatic-com/storybook": "^2.0.2",
-    "@storybook/addon-a11y": "^8.3.1",
-    "@storybook/addon-actions": "^8.3.1",
-    "@storybook/addon-docs": "^8.3.1",
-    "@storybook/addon-essentials": "^8.3.1",
-    "@storybook/addon-interactions": "^8.3.1",
-    "@storybook/addon-links": "^8.3.1",
-    "@storybook/addon-themes": "^8.3.1",
-    "@storybook/blocks": "^8.3.1",
-    "@storybook/test": "^8.3.1",
-    "@storybook/vue3": "^8.3.1",
-    "@storybook/vue3-vite": "^8.3.1",
+    "@storybook/addon-a11y": "^8.3.5",
+    "@storybook/addon-actions": "^8.3.5",
+    "@storybook/addon-docs": "^8.3.5",
+    "@storybook/addon-essentials": "^8.3.5",
+    "@storybook/addon-interactions": "^8.3.5",
+    "@storybook/addon-links": "^8.3.5",
+    "@storybook/addon-themes": "^8.3.5",
+    "@storybook/blocks": "^8.3.5",
+    "@storybook/test": "^8.3.5",
+    "@storybook/vue3": "^8.3.5",
+    "@storybook/vue3-vite": "^8.3.5",
     "chromatic": "^11.10.2",
-    "storybook": "^8.3.1"
+    "storybook": "^8.3.5"
   }
 }
diff --git a/packages/@n8n/task-runner/.eslintrc.js b/packages/@n8n/task-runner/.eslintrc.js
new file mode 100644
index 0000000000..dd79f2157e
--- /dev/null
+++ b/packages/@n8n/task-runner/.eslintrc.js
@@ -0,0 +1,19 @@
+const sharedOptions = require('@n8n_io/eslint-config/shared');
+
+/**
+ * @type {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports = {
+	extends: ['@n8n_io/eslint-config/node'],
+
+	...sharedOptions(__dirname),
+
+	ignorePatterns: ['jest.config.js'],
+
+	rules: {
+		'unicorn/filename-case': ['error', { case: 'kebabCase' }],
+		'@typescript-eslint/no-duplicate-imports': 'off',
+
+		complexity: 'error',
+	},
+};
diff --git a/packages/@n8n/task-runner/jest.config.js b/packages/@n8n/task-runner/jest.config.js
new file mode 100644
index 0000000000..5c3abe1ef7
--- /dev/null
+++ b/packages/@n8n/task-runner/jest.config.js
@@ -0,0 +1,5 @@
+/** @type {import('jest').Config} */
+module.exports = {
+	...require('../../../jest.config'),
+	testTimeout: 10_000,
+};
diff --git a/packages/@n8n/task-runner/package.json b/packages/@n8n/task-runner/package.json
new file mode 100644
index 0000000000..a82b97975d
--- /dev/null
+++ b/packages/@n8n/task-runner/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "@n8n/task-runner",
+  "version": "1.1.0",
+  "scripts": {
+    "clean": "rimraf dist .turbo",
+    "start": "node dist/start.js",
+    "dev": "pnpm build && pnpm start",
+    "typecheck": "tsc --noEmit",
+    "build": "tsc -p ./tsconfig.build.json && tsc-alias -p tsconfig.build.json",
+    "format": "biome format --write src",
+    "format:check": "biome ci src",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "lint": "eslint . --quiet",
+    "lintfix": "eslint . --fix",
+    "watch": "concurrently \"tsc -w -p tsconfig.build.json\" \"tsc-alias -w -p tsconfig.build.json\""
+  },
+  "main": "dist/start.js",
+  "module": "src/start.ts",
+  "types": "dist/start.d.ts",
+  "files": [
+    "dist/**/*"
+  ],
+  "dependencies": {
+    "n8n-workflow": "workspace:*",
+    "n8n-core": "workspace:*",
+    "nanoid": "^3.3.6",
+    "ws": "^8.18.0"
+  },
+  "devDependencies": {
+    "luxon": "catalog:"
+  }
+}
diff --git a/packages/@n8n/task-runner/src/authenticator.ts b/packages/@n8n/task-runner/src/authenticator.ts
new file mode 100644
index 0000000000..7edb4cadf6
--- /dev/null
+++ b/packages/@n8n/task-runner/src/authenticator.ts
@@ -0,0 +1,47 @@
+import { ApplicationError } from 'n8n-workflow';
+import * as a from 'node:assert/strict';
+
+export type AuthOpts = {
+	n8nUri: string;
+	authToken: string;
+};
+
+/**
+ * Requests a one-time token that can be used to establish a task runner connection
+ */
+export async function authenticate(opts: AuthOpts) {
+	try {
+		const authEndpoint = `http://${opts.n8nUri}/runners/auth`;
+		const response = await fetch(authEndpoint, {
+			method: 'POST',
+			headers: {
+				// eslint-disable-next-line @typescript-eslint/naming-convention
+				'Content-Type': 'application/json',
+			},
+			body: JSON.stringify({
+				token: opts.authToken,
+			}),
+		});
+
+		if (!response.ok) {
+			throw new ApplicationError(
+				`Invalid response status ${response.status}: ${await response.text()}`,
+			);
+		}
+
+		const { data } = (await response.json()) as { data: { token: string } };
+		const grantToken = data.token;
+		a.ok(grantToken);
+
+		return grantToken;
+	} catch (e) {
+		console.error(e);
+		const error = e as Error;
+		throw new ApplicationError(
+			`Could not connect to n8n message broker ${opts.n8nUri}: ${error.message}`,
+			{
+				cause: error,
+			},
+		);
+	}
+}
diff --git a/packages/@n8n/task-runner/src/index.ts b/packages/@n8n/task-runner/src/index.ts
new file mode 100644
index 0000000000..59e6f6d288
--- /dev/null
+++ b/packages/@n8n/task-runner/src/index.ts
@@ -0,0 +1,2 @@
+export * from './task-runner';
+export * from './runner-types';
diff --git a/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts
new file mode 100644
index 0000000000..499105f39d
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts
@@ -0,0 +1,762 @@
+import { DateTime } from 'luxon';
+import type { CodeExecutionMode, IDataObject } from 'n8n-workflow';
+import fs from 'node:fs';
+import { builtinModules } from 'node:module';
+
+import { ValidationError } from '@/js-task-runner/errors/validation-error';
+import type { JsTaskRunnerOpts } from '@/js-task-runner/js-task-runner';
+import {
+	JsTaskRunner,
+	type AllCodeTaskData,
+	type JSExecSettings,
+} from '@/js-task-runner/js-task-runner';
+import type { Task } from '@/task-runner';
+
+import { newAllCodeTaskData, newTaskWithSettings, withPairedItem, wrapIntoJson } from './test-data';
+import { ExecutionError } from '../errors/execution-error';
+
+jest.mock('ws');
+
+describe('JsTaskRunner', () => {
+	const createRunnerWithOpts = (opts: Partial<JsTaskRunnerOpts> = {}) =>
+		new JsTaskRunner({
+			wsUrl: 'ws://localhost',
+			grantToken: 'grantToken',
+			maxConcurrency: 1,
+			...opts,
+		});
+
+	const defaultTaskRunner = createRunnerWithOpts();
+
+	const execTaskWithParams = async ({
+		task,
+		taskData,
+		runner = defaultTaskRunner,
+	}: {
+		task: Task<JSExecSettings>;
+		taskData: AllCodeTaskData;
+		runner?: JsTaskRunner;
+	}) => {
+		jest.spyOn(runner, 'requestData').mockResolvedValue(taskData);
+		return await runner.executeTask(task);
+	};
+
+	afterEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	const executeForAllItems = async ({
+		code,
+		inputItems,
+		settings,
+		runner,
+	}: {
+		code: string;
+		inputItems: IDataObject[];
+		settings?: Partial<JSExecSettings>;
+		runner?: JsTaskRunner;
+	}) => {
+		return await execTaskWithParams({
+			task: newTaskWithSettings({
+				code,
+				nodeMode: 'runOnceForAllItems',
+				...settings,
+			}),
+			taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson)),
+			runner,
+		});
+	};
+
+	const executeForEachItem = async ({
+		code,
+		inputItems,
+		settings,
+		runner,
+	}: {
+		code: string;
+		inputItems: IDataObject[];
+		settings?: Partial<JSExecSettings>;
+
+		runner?: JsTaskRunner;
+	}) => {
+		return await execTaskWithParams({
+			task: newTaskWithSettings({
+				code,
+				nodeMode: 'runOnceForEachItem',
+				...settings,
+			}),
+			taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson)),
+			runner,
+		});
+	};
+
+	describe('console', () => {
+		test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+			'should make an rpc call for console log in %s mode',
+			async (nodeMode) => {
+				jest.spyOn(defaultTaskRunner, 'makeRpcCall').mockResolvedValue(undefined);
+				const task = newTaskWithSettings({
+					code: "console.log('Hello', 'world!'); return {}",
+					nodeMode,
+				});
+
+				await execTaskWithParams({
+					task,
+					taskData: newAllCodeTaskData([wrapIntoJson({})]),
+				});
+
+				expect(defaultTaskRunner.makeRpcCall).toHaveBeenCalledWith(task.taskId, 'logNodeOutput', [
+					'Hello world!',
+				]);
+			},
+		);
+	});
+
+	describe('built-in methods and variables available in the context', () => {
+		const inputItems = [{ a: 1 }];
+
+		const testExpressionForAllItems = async (
+			expression: string,
+			expected: IDataObject | string | number | boolean,
+		) => {
+			const needsWrapping = typeof expected !== 'object';
+			const outcome = await executeForAllItems({
+				code: needsWrapping ? `return { val: ${expression} }` : `return ${expression}`,
+				inputItems,
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson(needsWrapping ? { val: expected } : expected)]);
+		};
+
+		const testExpressionForEachItem = async (
+			expression: string,
+			expected: IDataObject | string | number | boolean,
+		) => {
+			const needsWrapping = typeof expected !== 'object';
+			const outcome = await executeForEachItem({
+				code: needsWrapping ? `return { val: ${expression} }` : `return ${expression}`,
+				inputItems,
+			});
+
+			expect(outcome.result).toEqual([
+				withPairedItem(0, wrapIntoJson(needsWrapping ? { val: expected } : expected)),
+			]);
+		};
+
+		const testGroups = {
+			// https://docs.n8n.io/code/builtin/current-node-input/
+			'current node input': [
+				['$input.first()', inputItems[0]],
+				['$input.last()', inputItems[inputItems.length - 1]],
+				['$input.params', { manualTriggerParam: 'empty' }],
+			],
+			// https://docs.n8n.io/code/builtin/output-other-nodes/
+			'output of other nodes': [
+				['$("Trigger").first()', inputItems[0]],
+				['$("Trigger").last()', inputItems[inputItems.length - 1]],
+				['$("Trigger").params', { manualTriggerParam: 'empty' }],
+			],
+			// https://docs.n8n.io/code/builtin/date-time/
+			'date and time': [
+				['$now', expect.any(DateTime)],
+				['$today', expect.any(DateTime)],
+				['{dt: DateTime}', { dt: expect.any(Function) }],
+			],
+			// https://docs.n8n.io/code/builtin/jmespath/
+			JMESPath: [['{ val: $jmespath([{ f: 1 },{ f: 2 }], "[*].f") }', { val: [1, 2] }]],
+			// https://docs.n8n.io/code/builtin/n8n-metadata/
+			'n8n metadata': [
+				[
+					'$execution',
+					{
+						id: 'exec-id',
+						mode: 'test',
+						resumeFormUrl: 'http://formWaitingBaseUrl/exec-id',
+						resumeUrl: 'http://webhookWaitingBaseUrl/exec-id',
+						customData: {
+							get: expect.any(Function),
+							getAll: expect.any(Function),
+							set: expect.any(Function),
+							setAll: expect.any(Function),
+						},
+					},
+				],
+				['$("Trigger").isExecuted', true],
+				['$nodeVersion', 2],
+				['$prevNode.name', 'Trigger'],
+				['$prevNode.outputIndex', 0],
+				['$runIndex', 0],
+				['{ wf: $workflow }', { wf: { active: true, id: '1', name: 'Test Workflow' } }],
+				['$vars', { var: 'value' }],
+			],
+		};
+
+		for (const [groupName, tests] of Object.entries(testGroups)) {
+			describe(`${groupName} runOnceForAllItems`, () => {
+				test.each(tests)(
+					'should have the %s available in the context',
+					async (expression, expected) => {
+						await testExpressionForAllItems(expression, expected);
+					},
+				);
+			});
+
+			describe(`${groupName} runOnceForEachItem`, () => {
+				test.each(tests)(
+					'should have the %s available in the context',
+					async (expression, expected) => {
+						await testExpressionForEachItem(expression, expected);
+					},
+				);
+			});
+		}
+
+		describe('$env', () => {
+			it('should have the env available in context when access has not been blocked', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskWithSettings({
+						code: 'return { val: $env.VAR1 }',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+						envProviderState: {
+							isEnvAccessBlocked: false,
+							isProcessAvailable: true,
+							env: { VAR1: 'value' },
+						},
+					}),
+				});
+
+				expect(outcome.result).toEqual([wrapIntoJson({ val: 'value' })]);
+			});
+
+			it('should be possible to access env if it has been blocked', async () => {
+				await expect(
+					execTaskWithParams({
+						task: newTaskWithSettings({
+							code: 'return { val: $env.VAR1 }',
+							nodeMode: 'runOnceForAllItems',
+						}),
+						taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+							envProviderState: {
+								isEnvAccessBlocked: true,
+								isProcessAvailable: true,
+								env: { VAR1: 'value' },
+							},
+						}),
+					}),
+				).rejects.toThrow('access to env vars denied');
+			});
+
+			it('should not be possible to iterate $env', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskWithSettings({
+						code: 'return Object.values($env).concat(Object.keys($env))',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+						envProviderState: {
+							isEnvAccessBlocked: false,
+							isProcessAvailable: true,
+							env: { VAR1: '1', VAR2: '2', VAR3: '3' },
+						},
+					}),
+				});
+
+				expect(outcome.result).toEqual([]);
+			});
+
+			it("should not expose task runner's env variables even if no env state is received", async () => {
+				process.env.N8N_RUNNERS_N8N_URI = 'http://127.0.0.1:5679';
+				const outcome = await execTaskWithParams({
+					task: newTaskWithSettings({
+						code: 'return { val: $env.N8N_RUNNERS_N8N_URI }',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+						envProviderState: undefined,
+					}),
+				});
+
+				expect(outcome.result).toEqual([wrapIntoJson({ val: undefined })]);
+			});
+		});
+	});
+
+	describe('runOnceForAllItems', () => {
+		describe('continue on fail', () => {
+			it('should return an item with the error if continueOnFail is true', async () => {
+				const outcome = await executeForAllItems({
+					code: 'throw new Error("Error message")',
+					inputItems: [{ a: 1 }],
+					settings: { continueOnFail: true },
+				});
+
+				expect(outcome).toEqual({
+					result: [wrapIntoJson({ error: 'Error message [line 1]' })],
+					customData: undefined,
+				});
+			});
+
+			it('should throw an error if continueOnFail is false', async () => {
+				await expect(
+					executeForAllItems({
+						code: 'throw new Error("Error message")',
+						inputItems: [{ a: 1 }],
+						settings: { continueOnFail: false },
+					}),
+				).rejects.toThrow('Error message');
+			});
+		});
+
+		describe('invalid output', () => {
+			test.each([['undefined'], ['42'], ['"a string"']])(
+				'should throw a ValidationError if the code output is %s',
+				async (output) => {
+					await expect(
+						executeForAllItems({
+							code: `return ${output}`,
+							inputItems: [{ a: 1 }],
+						}),
+					).rejects.toThrow(ValidationError);
+				},
+			);
+
+			it('should throw a ValidationError if some items are wrapped in json and some are not', async () => {
+				await expect(
+					executeForAllItems({
+						code: 'return [{b: 1}, {json: {b: 2}}]',
+						inputItems: [{ a: 1 }],
+					}),
+				).rejects.toThrow(ValidationError);
+			});
+		});
+
+		it('should return static items', async () => {
+			const outcome = await executeForAllItems({
+				code: 'return [{json: {b: 1}}]',
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome).toEqual({
+				result: [wrapIntoJson({ b: 1 })],
+				customData: undefined,
+			});
+		});
+
+		it('maps null into an empty array', async () => {
+			const outcome = await executeForAllItems({
+				code: 'return null',
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome).toEqual({
+				result: [],
+				customData: undefined,
+			});
+		});
+
+		it("should wrap items into json if they aren't", async () => {
+			const outcome = await executeForAllItems({
+				code: 'return [{b: 1}]',
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome).toEqual({
+				result: [wrapIntoJson({ b: 1 })],
+				customData: undefined,
+			});
+		});
+
+		it('should wrap single item into an array and json', async () => {
+			const outcome = await executeForAllItems({
+				code: 'return {b: 1}',
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome).toEqual({
+				result: [wrapIntoJson({ b: 1 })],
+				customData: undefined,
+			});
+		});
+
+		test.each([['items'], ['$input.all()'], ["$('Trigger').all()"]])(
+			'should have all input items in the context as %s',
+			async (expression) => {
+				const outcome = await executeForAllItems({
+					code: `return ${expression}`,
+					inputItems: [{ a: 1 }, { a: 2 }],
+				});
+
+				expect(outcome).toEqual({
+					result: [wrapIntoJson({ a: 1 }), wrapIntoJson({ a: 2 })],
+					customData: undefined,
+				});
+			},
+		);
+	});
+
+	describe('runForEachItem', () => {
+		describe('continue on fail', () => {
+			it('should return an item with the error if continueOnFail is true', async () => {
+				const outcome = await executeForEachItem({
+					code: 'throw new Error("Error message")',
+					inputItems: [{ a: 1 }, { a: 2 }],
+					settings: { continueOnFail: true },
+				});
+
+				expect(outcome).toEqual({
+					result: [
+						withPairedItem(0, wrapIntoJson({ error: 'Error message [line 1]' })),
+						withPairedItem(1, wrapIntoJson({ error: 'Error message [line 1]' })),
+					],
+					customData: undefined,
+				});
+			});
+
+			it('should throw an error if continueOnFail is false', async () => {
+				await expect(
+					executeForEachItem({
+						code: 'throw new Error("Error message")',
+						inputItems: [{ a: 1 }],
+						settings: { continueOnFail: false },
+					}),
+				).rejects.toThrow('Error message');
+			});
+		});
+
+		describe('invalid output', () => {
+			test.each([['undefined'], ['42'], ['"a string"'], ['[]'], ['[1,2,3]']])(
+				'should throw a ValidationError if the code output is %s',
+				async (output) => {
+					await expect(
+						executeForEachItem({
+							code: `return ${output}`,
+							inputItems: [{ a: 1 }],
+						}),
+					).rejects.toThrow(ValidationError);
+				},
+			);
+		});
+
+		it('should return static items', async () => {
+			const outcome = await executeForEachItem({
+				code: 'return {json: {b: 1}}',
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome).toEqual({
+				result: [withPairedItem(0, wrapIntoJson({ b: 1 }))],
+				customData: undefined,
+			});
+		});
+
+		it('should filter out null values', async () => {
+			const outcome = await executeForEachItem({
+				code: 'return item.json.a === 1 ? item : null',
+				inputItems: [{ a: 1 }, { a: 2 }, { a: 3 }],
+			});
+
+			expect(outcome).toEqual({
+				result: [withPairedItem(0, wrapIntoJson({ a: 1 }))],
+				customData: undefined,
+			});
+		});
+
+		test.each([['item'], ['$input.item'], ['{ json: $json }']])(
+			'should have the current input item in the context as %s',
+			async (expression) => {
+				const outcome = await executeForEachItem({
+					code: `return ${expression}`,
+					inputItems: [{ a: 1 }, { a: 2 }],
+				});
+
+				expect(outcome).toEqual({
+					result: [
+						withPairedItem(0, wrapIntoJson({ a: 1 })),
+						withPairedItem(1, wrapIntoJson({ a: 2 })),
+					],
+					customData: undefined,
+				});
+			},
+		);
+	});
+
+	describe('require', () => {
+		const inputItems = [{ a: 1 }];
+		const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+
+		describe('blocked by default', () => {
+			const testCases = [...builtinModules, ...Object.keys(packageJson.dependencies)];
+
+			test.each(testCases)(
+				'should throw an error when requiring %s in runOnceForAllItems mode',
+				async (module) => {
+					await expect(
+						executeForAllItems({
+							code: `return require('${module}')`,
+							inputItems,
+						}),
+					).rejects.toThrow(`Cannot find module '${module}'`);
+				},
+			);
+
+			test.each(testCases)(
+				'should throw an error when requiring %s in runOnceForEachItem mode',
+				async (module) => {
+					await expect(
+						executeForEachItem({
+							code: `return require('${module}')`,
+							inputItems,
+						}),
+					).rejects.toThrow(`Cannot find module '${module}'`);
+				},
+			);
+		});
+
+		describe('all built-ins allowed with *', () => {
+			const testCases = builtinModules;
+			const runner = createRunnerWithOpts({
+				allowedBuiltInModules: '*',
+			});
+
+			test.each(testCases)(
+				'should be able to require %s in runOnceForAllItems mode',
+				async (module) => {
+					await expect(
+						executeForAllItems({
+							code: `return { val: require('${module}') }`,
+							inputItems,
+							runner,
+						}),
+					).resolves.toBeDefined();
+				},
+			);
+
+			test.each(testCases)(
+				'should be able to require %s in runOnceForEachItem mode',
+				async (module) => {
+					await expect(
+						executeForEachItem({
+							code: `return { val: require('${module}') }`,
+							inputItems,
+							runner,
+						}),
+					).resolves.toBeDefined();
+				},
+			);
+		});
+
+		describe('all external modules allowed with *', () => {
+			const testCases = Object.keys(packageJson.dependencies);
+			const runner = createRunnerWithOpts({
+				allowedExternalModules: '*',
+			});
+
+			test.each(testCases)(
+				'should be able to require %s in runOnceForAllItems mode',
+				async (module) => {
+					await expect(
+						executeForAllItems({
+							code: `return { val: require('${module}') }`,
+							inputItems,
+							runner,
+						}),
+					).resolves.toBeDefined();
+				},
+			);
+
+			test.each(testCases)(
+				'should be able to require %s in runOnceForEachItem mode',
+				async (module) => {
+					await expect(
+						executeForEachItem({
+							code: `return { val: require('${module}') }`,
+							inputItems,
+							runner,
+						}),
+					).resolves.toBeDefined();
+				},
+			);
+		});
+
+		describe('specifically allowed built-in modules', () => {
+			const runner = createRunnerWithOpts({
+				allowedBuiltInModules: 'crypto,path',
+			});
+
+			const allowedCases = [
+				['crypto', 'require("crypto").randomBytes(16).toString("hex")', expect.any(String)],
+				['path', 'require("path").normalize("/root/./dir")', '/root/dir'],
+			];
+
+			const blockedCases = [['http'], ['process']];
+
+			test.each(allowedCases)(
+				'should allow requiring %s in runOnceForAllItems mode',
+				async (_moduleName, expression, expected) => {
+					const outcome = await executeForAllItems({
+						code: `return { val: ${expression} }`,
+						inputItems,
+						runner,
+					});
+
+					expect(outcome.result).toEqual([wrapIntoJson({ val: expected })]);
+				},
+			);
+
+			test.each(allowedCases)(
+				'should allow requiring %s in runOnceForEachItem mode',
+				async (_moduleName, expression, expected) => {
+					const outcome = await executeForEachItem({
+						code: `return { val: ${expression} }`,
+						inputItems,
+						runner,
+					});
+
+					expect(outcome.result).toEqual([withPairedItem(0, wrapIntoJson({ val: expected }))]);
+				},
+			);
+
+			test.each(blockedCases)(
+				'should throw when trying to require %s in runOnceForAllItems mode',
+				async (moduleName) => {
+					await expect(
+						executeForAllItems({
+							code: `require("${moduleName}")`,
+							inputItems,
+							runner,
+						}),
+					).rejects.toThrow(`Cannot find module '${moduleName}'`);
+				},
+			);
+
+			test.each(blockedCases)(
+				'should throw when trying to require %s in runOnceForEachItem mode',
+				async (moduleName) => {
+					await expect(
+						executeForEachItem({
+							code: `require("${moduleName}")`,
+							inputItems,
+							runner,
+						}),
+					).rejects.toThrow(`Cannot find module '${moduleName}'`);
+				},
+			);
+		});
+
+		describe('specifically allowed external modules', () => {
+			const runner = createRunnerWithOpts({
+				allowedExternalModules: 'nanoid',
+			});
+
+			const allowedCases = [['nanoid', 'require("nanoid").nanoid()', expect.any(String)]];
+
+			const blockedCases = [['n8n-core']];
+
+			test.each(allowedCases)(
+				'should allow requiring %s in runOnceForAllItems mode',
+				async (_moduleName, expression, expected) => {
+					const outcome = await executeForAllItems({
+						code: `return { val: ${expression} }`,
+						inputItems,
+						runner,
+					});
+
+					expect(outcome.result).toEqual([wrapIntoJson({ val: expected })]);
+				},
+			);
+
+			test.each(allowedCases)(
+				'should allow requiring %s in runOnceForEachItem mode',
+				async (_moduleName, expression, expected) => {
+					const outcome = await executeForEachItem({
+						code: `return { val: ${expression} }`,
+						inputItems,
+						runner,
+					});
+
+					expect(outcome.result).toEqual([withPairedItem(0, wrapIntoJson({ val: expected }))]);
+				},
+			);
+
+			test.each(blockedCases)(
+				'should throw when trying to require %s in runOnceForAllItems mode',
+				async (moduleName) => {
+					await expect(
+						executeForAllItems({
+							code: `require("${moduleName}")`,
+							inputItems,
+							runner,
+						}),
+					).rejects.toThrow(`Cannot find module '${moduleName}'`);
+				},
+			);
+
+			test.each(blockedCases)(
+				'should throw when trying to require %s in runOnceForEachItem mode',
+				async (moduleName) => {
+					await expect(
+						executeForEachItem({
+							code: `require("${moduleName}")`,
+							inputItems,
+							runner,
+						}),
+					).rejects.toThrow(`Cannot find module '${moduleName}'`);
+				},
+			);
+		});
+	});
+
+	describe('errors', () => {
+		test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+			'should throw an ExecutionError if the code is invalid in %s mode',
+			async (nodeMode) => {
+				await expect(
+					execTaskWithParams({
+						task: newTaskWithSettings({
+							code: 'unknown',
+							nodeMode,
+						}),
+						taskData: newAllCodeTaskData([wrapIntoJson({ a: 1 })]),
+					}),
+				).rejects.toThrow(ExecutionError);
+			},
+		);
+
+		it('sends serializes an error correctly', async () => {
+			const runner = createRunnerWithOpts({});
+			const taskId = '1';
+			const task = newTaskWithSettings({
+				code: 'unknown; return []',
+				nodeMode: 'runOnceForAllItems',
+				continueOnFail: false,
+				mode: 'manual',
+				workflowMode: 'manual',
+			});
+			runner.runningTasks.set(taskId, task);
+
+			const sendSpy = jest.spyOn(runner.ws, 'send').mockImplementation(() => {});
+			jest.spyOn(runner, 'sendOffers').mockImplementation(() => {});
+			jest
+				.spyOn(runner, 'requestData')
+				.mockResolvedValue(newAllCodeTaskData([wrapIntoJson({ a: 1 })]));
+
+			await runner.receivedSettings(taskId, task.settings);
+
+			expect(sendSpy).toHaveBeenCalledWith(
+				JSON.stringify({
+					type: 'runner:taskerror',
+					taskId,
+					error: {
+						message: 'unknown is not defined [line 1]',
+						description: 'ReferenceError',
+						lineNumber: 1,
+					},
+				}),
+			);
+
+			console.log('DONE');
+		}, 1000);
+	});
+});
diff --git a/packages/@n8n/task-runner/src/js-task-runner/__tests__/test-data.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/test-data.ts
new file mode 100644
index 0000000000..b157094619
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/test-data.ts
@@ -0,0 +1,168 @@
+import type { IDataObject, INode, INodeExecutionData, ITaskData } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+import { nanoid } from 'nanoid';
+
+import type { AllCodeTaskData, JSExecSettings } from '@/js-task-runner/js-task-runner';
+import type { Task } from '@/task-runner';
+
+/**
+ * Creates a new task with the given settings
+ */
+export const newTaskWithSettings = (
+	settings: Partial<JSExecSettings> & Pick<JSExecSettings, 'code' | 'nodeMode'>,
+): Task<JSExecSettings> => ({
+	taskId: '1',
+	settings: {
+		workflowMode: 'manual',
+		continueOnFail: false,
+		mode: 'manual',
+		...settings,
+	},
+	active: true,
+	cancelled: false,
+});
+
+/**
+ * Creates a new node with the given options
+ */
+export const newNode = (opts: Partial<INode> = {}): INode => ({
+	id: nanoid(),
+	name: 'Test Node' + nanoid(),
+	parameters: {},
+	position: [0, 0],
+	type: 'n8n-nodes-base.code',
+	typeVersion: 1,
+	...opts,
+});
+
+/**
+ * Creates a new task data with the given options
+ */
+export const newTaskData = (opts: Partial<ITaskData> & Pick<ITaskData, 'source'>): ITaskData => ({
+	startTime: Date.now(),
+	executionTime: 0,
+	executionStatus: 'success',
+	...opts,
+});
+
+/**
+ * Creates a new all code task data with the given options
+ */
+export const newAllCodeTaskData = (
+	codeNodeInputData: INodeExecutionData[],
+	opts: Partial<AllCodeTaskData> = {},
+): AllCodeTaskData => {
+	const codeNode = newNode({
+		name: 'JsCode',
+		parameters: {
+			mode: 'runOnceForEachItem',
+			language: 'javaScript',
+			jsCode: 'return item',
+		},
+		type: 'n8n-nodes-base.code',
+		typeVersion: 2,
+	});
+	const manualTriggerNode = newNode({
+		name: 'Trigger',
+		type: 'n8n-nodes-base.manualTrigger',
+		parameters: {
+			manualTriggerParam: 'empty',
+		},
+	});
+
+	return {
+		workflow: {
+			id: '1',
+			name: 'Test Workflow',
+			active: true,
+			connections: {
+				[manualTriggerNode.name]: {
+					main: [[{ node: codeNode.name, type: NodeConnectionType.Main, index: 0 }]],
+				},
+			},
+			nodes: [manualTriggerNode, codeNode],
+		},
+		inputData: {
+			main: [codeNodeInputData],
+		},
+		connectionInputData: codeNodeInputData,
+		node: codeNode,
+		runExecutionData: {
+			startData: {},
+			resultData: {
+				runData: {
+					[manualTriggerNode.name]: [
+						newTaskData({
+							source: [],
+							data: {
+								main: [codeNodeInputData],
+							},
+						}),
+					],
+				},
+				pinData: {},
+				lastNodeExecuted: manualTriggerNode.name,
+			},
+			executionData: {
+				contextData: {},
+				nodeExecutionStack: [],
+				metadata: {},
+				waitingExecution: {},
+				waitingExecutionSource: {},
+			},
+		},
+		runIndex: 0,
+		itemIndex: 0,
+		activeNodeName: codeNode.name,
+		contextNodeName: codeNode.name,
+		defaultReturnRunIndex: -1,
+		siblingParameters: {},
+		mode: 'manual',
+		selfData: {},
+		envProviderState: {
+			env: {},
+			isEnvAccessBlocked: true,
+			isProcessAvailable: true,
+		},
+		additionalData: {
+			executionId: 'exec-id',
+			instanceBaseUrl: '',
+			restartExecutionId: '',
+			restApiUrl: '',
+			formWaitingBaseUrl: 'http://formWaitingBaseUrl',
+			webhookBaseUrl: 'http://webhookBaseUrl',
+			webhookTestBaseUrl: 'http://webhookTestBaseUrl',
+			webhookWaitingBaseUrl: 'http://webhookWaitingBaseUrl',
+			variables: {
+				var: 'value',
+			},
+		},
+		executeData: {
+			node: codeNode,
+			data: {
+				main: [codeNodeInputData],
+			},
+			source: {
+				main: [{ previousNode: manualTriggerNode.name }],
+			},
+		},
+		...opts,
+	};
+};
+
+/**
+ * Wraps the given value into an INodeExecutionData object's json property
+ */
+export const wrapIntoJson = (json: IDataObject): INodeExecutionData => ({
+	json,
+});
+
+/**
+ * Adds the given index as the pairedItem property to the given INodeExecutionData object
+ */
+export const withPairedItem = (index: number, data: INodeExecutionData): INodeExecutionData => ({
+	...data,
+	pairedItem: {
+		item: index,
+	},
+});
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts
new file mode 100644
index 0000000000..3777940021
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts
@@ -0,0 +1,53 @@
+import { ExecutionError } from '../execution-error';
+
+describe('ExecutionError', () => {
+	const defaultStack = `TypeError: a.unknown is not a function
+    at VmCodeWrapper (evalmachine.<anonymous>:2:3)
+    at evalmachine.<anonymous>:7:2
+    at Script.runInContext (node:vm:148:12)
+    at Script.runInNewContext (node:vm:153:17)
+    at runInNewContext (node:vm:309:38)
+    at JsTaskRunner.runForAllItems (/n8n/packages/@n8n/task-runner/dist/js-task-runner/js-task-runner.js:90:65)
+    at JsTaskRunner.executeTask (/n8n/packages/@n8n/task-runner/dist/js-task-runner/js-task-runner.js:71:26)
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+    at async JsTaskRunner.receivedSettings (/n8n/packages/@n8n/task-runner/dist/task-runner.js:190:26)`;
+
+	it('should parse error details from stack trace without itemIndex', () => {
+		const error = new Error('a.unknown is not a function');
+		error.stack = defaultStack;
+
+		const executionError = new ExecutionError(error);
+		expect(executionError.message).toBe('a.unknown is not a function [line 2]');
+		expect(executionError.lineNumber).toBe(2);
+		expect(executionError.description).toBe('TypeError');
+		expect(executionError.context).toBeUndefined();
+	});
+
+	it('should parse error details from stack trace with itemIndex', () => {
+		const error = new Error('a.unknown is not a function');
+		error.stack = defaultStack;
+
+		const executionError = new ExecutionError(error, 1);
+		expect(executionError.message).toBe('a.unknown is not a function [line 2, for item 1]');
+		expect(executionError.lineNumber).toBe(2);
+		expect(executionError.description).toBe('TypeError');
+		expect(executionError.context).toEqual({ itemIndex: 1 });
+	});
+
+	it('should serialize correctly', () => {
+		const error = new Error('a.unknown is not a function');
+		error.stack = defaultStack;
+
+		const executionError = new ExecutionError(error, 1);
+
+		expect(JSON.stringify(executionError)).toBe(
+			JSON.stringify({
+				message: 'a.unknown is not a function [line 2, for item 1]',
+				description: 'TypeError',
+				itemIndex: 1,
+				context: { itemIndex: 1 },
+				lineNumber: 2,
+			}),
+		);
+	});
+});
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/error-like.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/error-like.ts
new file mode 100644
index 0000000000..1eaf744e89
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/error-like.ts
@@ -0,0 +1,12 @@
+export interface ErrorLike {
+	message: string;
+	stack?: string;
+}
+
+export function isErrorLike(value: unknown): value is ErrorLike {
+	if (typeof value !== 'object' || value === null) return false;
+
+	const errorLike = value as ErrorLike;
+
+	return typeof errorLike.message === 'string';
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts
new file mode 100644
index 0000000000..63a2dd5e0b
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts
@@ -0,0 +1,94 @@
+import type { ErrorLike } from './error-like';
+import { SerializableError } from './serializable-error';
+
+const VM_WRAPPER_FN_NAME = 'VmCodeWrapper';
+
+export class ExecutionError extends SerializableError {
+	description: string | null = null;
+
+	itemIndex: number | undefined = undefined;
+
+	context: { itemIndex: number } | undefined = undefined;
+
+	stack = '';
+
+	lineNumber: number | undefined = undefined;
+
+	constructor(error: ErrorLike, itemIndex?: number) {
+		super(error.message);
+		this.itemIndex = itemIndex;
+
+		if (this.itemIndex !== undefined) {
+			this.context = { itemIndex: this.itemIndex };
+		}
+
+		this.stack = error.stack ?? '';
+
+		this.populateFromStack();
+	}
+
+	/**
+	 * Populate error `message` and `description` from error `stack`.
+	 */
+	private populateFromStack() {
+		const stackRows = this.stack.split('\n');
+
+		if (stackRows.length === 0) {
+			this.message = 'Unknown error';
+			return;
+		}
+
+		const messageRow = stackRows.find((line) => line.includes('Error:'));
+		const lineNumberRow = stackRows.find((line) => line.includes(`at ${VM_WRAPPER_FN_NAME} `));
+		const lineNumberDisplay = this.toLineNumberDisplay(lineNumberRow);
+
+		if (!messageRow) {
+			this.message = `Unknown error ${lineNumberDisplay}`;
+			return;
+		}
+
+		const [errorDetails, errorType] = this.toErrorDetailsAndType(messageRow);
+
+		if (errorType) this.description = errorType;
+
+		if (!errorDetails) {
+			this.message = `Unknown error ${lineNumberDisplay}`;
+			return;
+		}
+
+		this.message = `${errorDetails} ${lineNumberDisplay}`;
+	}
+
+	private toLineNumberDisplay(lineNumberRow?: string) {
+		if (!lineNumberRow) return '';
+
+		// TODO: This doesn't work if there is a function definition in the code
+		// and the error is thrown from that function.
+
+		const regex = new RegExp(
+			`at ${VM_WRAPPER_FN_NAME} \\(evalmachine\\.<anonymous>:(?<lineNumber>\\d+):`,
+		);
+		const errorLineNumberMatch = lineNumberRow.match(regex);
+		if (!errorLineNumberMatch?.groups?.lineNumber) return null;
+
+		const lineNumber = errorLineNumberMatch.groups.lineNumber;
+		if (!lineNumber) return '';
+
+		this.lineNumber = Number(lineNumber);
+
+		return this.itemIndex === undefined
+			? `[line ${lineNumber}]`
+			: `[line ${lineNumber}, for item ${this.itemIndex}]`;
+	}
+
+	private toErrorDetailsAndType(messageRow?: string) {
+		if (!messageRow) return [null, null];
+
+		const [errorDetails, errorType] = messageRow
+			.split(':')
+			.reverse()
+			.map((i) => i.trim());
+
+		return [errorDetails, errorType === 'Error' ? null : errorType];
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/serializable-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/serializable-error.ts
new file mode 100644
index 0000000000..cd0e568de0
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/serializable-error.ts
@@ -0,0 +1,21 @@
+/**
+ * Error that has its message property serialized as well. Used to transport
+ * errors over the wire.
+ */
+export abstract class SerializableError extends Error {
+	constructor(message: string) {
+		super(message);
+
+		// So it is serialized as well
+		this.makeMessageEnumerable();
+	}
+
+	private makeMessageEnumerable() {
+		Object.defineProperty(this, 'message', {
+			value: this.message,
+			enumerable: true, // This makes the message property enumerable
+			writable: true,
+			configurable: true,
+		});
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/validation-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/validation-error.ts
new file mode 100644
index 0000000000..bf66136ccf
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/validation-error.ts
@@ -0,0 +1,44 @@
+import { SerializableError } from './serializable-error';
+
+export class ValidationError extends SerializableError {
+	description = '';
+
+	itemIndex: number | undefined = undefined;
+
+	context: { itemIndex: number } | undefined = undefined;
+
+	lineNumber: number | undefined = undefined;
+
+	constructor({
+		message,
+		description,
+		itemIndex,
+		lineNumber,
+	}: {
+		message: string;
+		description: string;
+		itemIndex?: number;
+		lineNumber?: number;
+	}) {
+		super(message);
+
+		this.lineNumber = lineNumber;
+		this.itemIndex = itemIndex;
+
+		if (this.lineNumber !== undefined && this.itemIndex !== undefined) {
+			this.message = `${message} [line ${lineNumber}, for item ${itemIndex}]`;
+		} else if (this.lineNumber !== undefined) {
+			this.message = `${message} [line ${lineNumber}]`;
+		} else if (this.itemIndex !== undefined) {
+			this.message = `${message} [item ${itemIndex}]`;
+		} else {
+			this.message = message;
+		}
+
+		this.description = description;
+
+		if (this.itemIndex !== undefined) {
+			this.context = { itemIndex: this.itemIndex };
+		}
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts b/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts
new file mode 100644
index 0000000000..5bf2e06f26
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts
@@ -0,0 +1,324 @@
+import { getAdditionalKeys } from 'n8n-core';
+import {
+	WorkflowDataProxy,
+	// type IWorkflowDataProxyAdditionalKeys,
+	Workflow,
+} from 'n8n-workflow';
+import type {
+	CodeExecutionMode,
+	INode,
+	INodeType,
+	ITaskDataConnections,
+	IWorkflowExecuteAdditionalData,
+	WorkflowParameters,
+	IDataObject,
+	IExecuteData,
+	INodeExecutionData,
+	INodeParameters,
+	IRunExecutionData,
+	WorkflowExecuteMode,
+	EnvProviderState,
+} from 'n8n-workflow';
+import * as a from 'node:assert';
+import { runInNewContext, type Context } from 'node:vm';
+
+import type { TaskResultData } from '@/runner-types';
+import { type Task, TaskRunner } from '@/task-runner';
+
+import { isErrorLike } from './errors/error-like';
+import { ExecutionError } from './errors/execution-error';
+import type { RequireResolver } from './require-resolver';
+import { createRequireResolver } from './require-resolver';
+import { validateRunForAllItemsOutput, validateRunForEachItemOutput } from './result-validation';
+
+export interface JSExecSettings {
+	code: string;
+	nodeMode: CodeExecutionMode;
+	workflowMode: WorkflowExecuteMode;
+	continueOnFail: boolean;
+
+	// For workflow data proxy
+	mode: WorkflowExecuteMode;
+}
+
+export interface PartialAdditionalData {
+	executionId?: string;
+	restartExecutionId?: string;
+	restApiUrl: string;
+	instanceBaseUrl: string;
+	formWaitingBaseUrl: string;
+	webhookBaseUrl: string;
+	webhookWaitingBaseUrl: string;
+	webhookTestBaseUrl: string;
+	currentNodeParameters?: INodeParameters;
+	executionTimeoutTimestamp?: number;
+	userId?: string;
+	variables: IDataObject;
+}
+
+export interface AllCodeTaskData {
+	workflow: Omit<WorkflowParameters, 'nodeTypes'>;
+	inputData: ITaskDataConnections;
+	node: INode;
+
+	runExecutionData: IRunExecutionData;
+	runIndex: number;
+	itemIndex: number;
+	activeNodeName: string;
+	connectionInputData: INodeExecutionData[];
+	siblingParameters: INodeParameters;
+	mode: WorkflowExecuteMode;
+	envProviderState?: EnvProviderState;
+	executeData?: IExecuteData;
+	defaultReturnRunIndex: number;
+	selfData: IDataObject;
+	contextNodeName: string;
+	additionalData: PartialAdditionalData;
+}
+
+export interface JsTaskRunnerOpts {
+	wsUrl: string;
+	grantToken: string;
+	maxConcurrency: number;
+	name?: string;
+	/**
+	 * List of built-in nodejs modules that are allowed to be required in the
+	 * execution sandbox. Asterisk (*) can be used to allow all.
+	 */
+	allowedBuiltInModules?: string;
+	/**
+	 * List of npm modules that are allowed to be required in the execution
+	 * sandbox. Asterisk (*) can be used to allow all.
+	 */
+	allowedExternalModules?: string;
+}
+
+type CustomConsole = {
+	log: (...args: unknown[]) => void;
+};
+
+export class JsTaskRunner extends TaskRunner {
+	private readonly requireResolver: RequireResolver;
+
+	constructor({
+		grantToken,
+		maxConcurrency,
+		wsUrl,
+		name = 'JS Task Runner',
+		allowedBuiltInModules,
+		allowedExternalModules,
+	}: JsTaskRunnerOpts) {
+		super('javascript', wsUrl, grantToken, maxConcurrency, name);
+
+		const parseModuleAllowList = (moduleList: string) =>
+			moduleList === '*' ? null : new Set(moduleList.split(',').map((x) => x.trim()));
+
+		this.requireResolver = createRequireResolver({
+			allowedBuiltInModules: parseModuleAllowList(allowedBuiltInModules ?? ''),
+			allowedExternalModules: parseModuleAllowList(allowedExternalModules ?? ''),
+		});
+	}
+
+	async executeTask(task: Task<JSExecSettings>): Promise<TaskResultData> {
+		const allData = await this.requestData<AllCodeTaskData>(task.taskId, 'all');
+
+		const settings = task.settings;
+		a.ok(settings, 'JS Code not sent to runner');
+
+		const workflowParams = allData.workflow;
+		const workflow = new Workflow({
+			...workflowParams,
+			nodeTypes: {
+				getByNameAndVersion() {
+					return undefined as unknown as INodeType;
+				},
+				getByName() {
+					return undefined as unknown as INodeType;
+				},
+				getKnownTypes() {
+					return {};
+				},
+			},
+		});
+
+		const customConsole = {
+			// Send log output back to the main process. It will take care of forwarding
+			// it to the UI or printing to console.
+			log: (...args: unknown[]) => {
+				const logOutput = args
+					.map((arg) => (typeof arg === 'object' && arg !== null ? JSON.stringify(arg) : arg))
+					.join(' ');
+				void this.makeRpcCall(task.taskId, 'logNodeOutput', [logOutput]);
+			},
+		};
+
+		const result =
+			settings.nodeMode === 'runOnceForAllItems'
+				? await this.runForAllItems(task.taskId, settings, allData, workflow, customConsole)
+				: await this.runForEachItem(task.taskId, settings, allData, workflow, customConsole);
+
+		return {
+			result,
+			customData: allData.runExecutionData.resultData.metadata,
+		};
+	}
+
+	/**
+	 * Executes the requested code for all items in a single run
+	 */
+	private async runForAllItems(
+		taskId: string,
+		settings: JSExecSettings,
+		allData: AllCodeTaskData,
+		workflow: Workflow,
+		customConsole: CustomConsole,
+	): Promise<INodeExecutionData[]> {
+		const dataProxy = this.createDataProxy(allData, workflow, allData.itemIndex);
+		const inputItems = allData.connectionInputData;
+
+		const context: Context = {
+			require: this.requireResolver,
+			module: {},
+			console: customConsole,
+
+			items: inputItems,
+			...dataProxy,
+			...this.buildRpcCallObject(taskId),
+		};
+
+		try {
+			const result = (await runInNewContext(
+				`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
+				context,
+			)) as TaskResultData['result'];
+
+			if (result === null) {
+				return [];
+			}
+
+			return validateRunForAllItemsOutput(result);
+		} catch (e) {
+			// Errors thrown by the VM are not instances of Error, so map them to an ExecutionError
+			const error = this.toExecutionErrorIfNeeded(e);
+
+			if (settings.continueOnFail) {
+				return [{ json: { error: error.message } }];
+			}
+
+			throw error;
+		}
+	}
+
+	/**
+	 * Executes the requested code for each item in the input data
+	 */
+	private async runForEachItem(
+		taskId: string,
+		settings: JSExecSettings,
+		allData: AllCodeTaskData,
+		workflow: Workflow,
+		customConsole: CustomConsole,
+	): Promise<INodeExecutionData[]> {
+		const inputItems = allData.connectionInputData;
+		const returnData: INodeExecutionData[] = [];
+
+		for (let index = 0; index < inputItems.length; index++) {
+			const item = inputItems[index];
+			const dataProxy = this.createDataProxy(allData, workflow, index);
+			const context: Context = {
+				require: this.requireResolver,
+				module: {},
+				console: customConsole,
+				item,
+
+				...dataProxy,
+				...this.buildRpcCallObject(taskId),
+			};
+
+			try {
+				let result = (await runInNewContext(
+					`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
+					context,
+				)) as INodeExecutionData | undefined;
+
+				// Filter out null values
+				if (result === null) {
+					continue;
+				}
+
+				result = validateRunForEachItemOutput(result, index);
+				if (result) {
+					returnData.push(
+						result.binary
+							? {
+									json: result.json,
+									pairedItem: { item: index },
+									binary: result.binary,
+								}
+							: {
+									json: result.json,
+									pairedItem: { item: index },
+								},
+					);
+				}
+			} catch (e) {
+				// Errors thrown by the VM are not instances of Error, so map them to an ExecutionError
+				const error = this.toExecutionErrorIfNeeded(e);
+
+				if (!settings.continueOnFail) {
+					throw error;
+				}
+
+				returnData.push({
+					json: { error: error.message },
+					pairedItem: {
+						item: index,
+					},
+				});
+			}
+		}
+
+		return returnData;
+	}
+
+	private createDataProxy(allData: AllCodeTaskData, workflow: Workflow, itemIndex: number) {
+		return new WorkflowDataProxy(
+			workflow,
+			allData.runExecutionData,
+			allData.runIndex,
+			itemIndex,
+			allData.activeNodeName,
+			allData.connectionInputData,
+			allData.siblingParameters,
+			allData.mode,
+			getAdditionalKeys(
+				allData.additionalData as IWorkflowExecuteAdditionalData,
+				allData.mode,
+				allData.runExecutionData,
+			),
+			allData.executeData,
+			allData.defaultReturnRunIndex,
+			allData.selfData,
+			allData.contextNodeName,
+			// Make sure that even if we don't receive the envProviderState for
+			// whatever reason, we don't expose the task runner's env to the code
+			allData.envProviderState ?? {
+				env: {},
+				isEnvAccessBlocked: false,
+				isProcessAvailable: true,
+			},
+		).getDataProxy();
+	}
+
+	private toExecutionErrorIfNeeded(error: unknown): Error {
+		if (error instanceof Error) {
+			return error;
+		}
+
+		if (isErrorLike(error)) {
+			return new ExecutionError(error);
+		}
+
+		return new ExecutionError({ message: JSON.stringify(error) });
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/obj-utils.ts b/packages/@n8n/task-runner/src/js-task-runner/obj-utils.ts
new file mode 100644
index 0000000000..1e49e475d2
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/obj-utils.ts
@@ -0,0 +1,5 @@
+export function isObject(maybe: unknown): maybe is { [key: string]: unknown } {
+	return (
+		typeof maybe === 'object' && maybe !== null && !Array.isArray(maybe) && !(maybe instanceof Date)
+	);
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/require-resolver.ts b/packages/@n8n/task-runner/src/js-task-runner/require-resolver.ts
new file mode 100644
index 0000000000..ffa00c0441
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/require-resolver.ts
@@ -0,0 +1,43 @@
+import { ApplicationError } from 'n8n-workflow';
+import { isBuiltin } from 'node:module';
+
+import { ExecutionError } from './errors/execution-error';
+
+export type RequireResolverOpts = {
+	/**
+	 * List of built-in nodejs modules that are allowed to be required in the
+	 * execution sandbox. `null` means all are allowed.
+	 */
+	allowedBuiltInModules: Set<string> | null;
+
+	/**
+	 * List of external modules that are allowed to be required in the
+	 * execution sandbox. `null` means all are allowed.
+	 */
+	allowedExternalModules: Set<string> | null;
+};
+
+export type RequireResolver = (request: string) => unknown;
+
+export function createRequireResolver({
+	allowedBuiltInModules,
+	allowedExternalModules,
+}: RequireResolverOpts) {
+	return (request: string) => {
+		const checkIsAllowed = (allowList: Set<string> | null, moduleName: string) => {
+			return allowList ? allowList.has(moduleName) : true;
+		};
+
+		const isAllowed = isBuiltin(request)
+			? checkIsAllowed(allowedBuiltInModules, request)
+			: checkIsAllowed(allowedExternalModules, request);
+
+		if (!isAllowed) {
+			const error = new ApplicationError(`Cannot find module '${request}'`);
+			throw new ExecutionError(error);
+		}
+
+		// eslint-disable-next-line @typescript-eslint/no-var-requires
+		return require(request) as unknown;
+	};
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/result-validation.ts b/packages/@n8n/task-runner/src/js-task-runner/result-validation.ts
new file mode 100644
index 0000000000..b7d0ffc5fc
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/result-validation.ts
@@ -0,0 +1,116 @@
+import { normalizeItems } from 'n8n-core';
+import type { INodeExecutionData } from 'n8n-workflow';
+
+import { ValidationError } from './errors/validation-error';
+import { isObject } from './obj-utils';
+
+export const REQUIRED_N8N_ITEM_KEYS = new Set(['json', 'binary', 'pairedItem', 'error']);
+
+function validateTopLevelKeys(item: INodeExecutionData, itemIndex: number) {
+	for (const key in item) {
+		if (Object.prototype.hasOwnProperty.call(item, key)) {
+			if (REQUIRED_N8N_ITEM_KEYS.has(key)) return;
+
+			throw new ValidationError({
+				message: `Unknown top-level item key: ${key}`,
+				description: 'Access the properties of an item under `.json`, e.g. `item.json`',
+				itemIndex,
+			});
+		}
+	}
+}
+
+function validateItem({ json, binary }: INodeExecutionData, itemIndex: number) {
+	if (json === undefined || !isObject(json)) {
+		throw new ValidationError({
+			message: "A 'json' property isn't an object",
+			description: "In the returned data, every key named 'json' must point to an object.",
+			itemIndex,
+		});
+	}
+
+	if (binary !== undefined && !isObject(binary)) {
+		throw new ValidationError({
+			message: "A 'binary' property isn't an object",
+			description: "In the returned data, every key named 'binary' must point to an object.",
+			itemIndex,
+		});
+	}
+}
+
+/**
+ * Validates the output of a code node in 'Run for All Items' mode.
+ */
+export function validateRunForAllItemsOutput(
+	executionResult: INodeExecutionData | INodeExecutionData[] | undefined,
+) {
+	if (typeof executionResult !== 'object') {
+		throw new ValidationError({
+			message: "Code doesn't return items properly",
+			description: 'Please return an array of objects, one for each item you would like to output.',
+		});
+	}
+
+	if (Array.isArray(executionResult)) {
+		/**
+		 * If at least one top-level key is an n8n item key (`json`, `binary`, etc.),
+		 * then require all item keys to be an n8n item key.
+		 *
+		 * If no top-level key is an n8n key, then skip this check, allowing non-n8n
+		 * item keys to be wrapped in `json` when normalizing items below.
+		 */
+		const mustHaveTopLevelN8nKey = executionResult.some((item) =>
+			Object.keys(item).find((key) => REQUIRED_N8N_ITEM_KEYS.has(key)),
+		);
+
+		if (mustHaveTopLevelN8nKey) {
+			for (let index = 0; index < executionResult.length; index++) {
+				const item = executionResult[index];
+				validateTopLevelKeys(item, index);
+			}
+		}
+	}
+
+	const returnData = normalizeItems(executionResult);
+	returnData.forEach(validateItem);
+	return returnData;
+}
+
+/**
+ * Validates the output of a code node in 'Run for Each Item' mode for single item
+ */
+export function validateRunForEachItemOutput(
+	executionResult: INodeExecutionData | undefined,
+	itemIndex: number,
+) {
+	if (typeof executionResult !== 'object') {
+		throw new ValidationError({
+			message: "Code doesn't return an object",
+			description: `Please return an object representing the output item. ('${executionResult}' was returned instead.)`,
+			itemIndex,
+		});
+	}
+
+	if (Array.isArray(executionResult)) {
+		const firstSentence =
+			executionResult.length > 0
+				? `An array of ${typeof executionResult[0]}s was returned.`
+				: 'An empty array was returned.';
+		throw new ValidationError({
+			message: "Code doesn't return a single object",
+			description: `${firstSentence} If you need to output multiple items, please use the 'Run Once for All Items' mode instead.`,
+			itemIndex,
+		});
+	}
+
+	const [returnData] = normalizeItems([executionResult]);
+
+	validateItem(returnData, itemIndex);
+
+	// If at least one top-level key is a supported item key (`json`, `binary`, etc.),
+	// and another top-level key is unrecognized, then the user mis-added a property
+	// directly on the item, when they intended to add it on the `json` property
+	validateTopLevelKeys(returnData, itemIndex);
+
+	return returnData;
+}
diff --git a/packages/@n8n/task-runner/src/runner-types.ts b/packages/@n8n/task-runner/src/runner-types.ts
new file mode 100644
index 0000000000..27b4e9a76c
--- /dev/null
+++ b/packages/@n8n/task-runner/src/runner-types.ts
@@ -0,0 +1,231 @@
+import type { INodeExecutionData } from 'n8n-workflow';
+
+export type DataRequestType = 'input' | 'node' | 'all';
+
+export interface TaskResultData {
+	result: INodeExecutionData[];
+	customData?: Record<string, string>;
+}
+
+export namespace N8nMessage {
+	export namespace ToRunner {
+		export interface InfoRequest {
+			type: 'broker:inforequest';
+		}
+
+		export interface RunnerRegistered {
+			type: 'broker:runnerregistered';
+		}
+
+		export interface TaskOfferAccept {
+			type: 'broker:taskofferaccept';
+			taskId: string;
+			offerId: string;
+		}
+
+		export interface TaskCancel {
+			type: 'broker:taskcancel';
+			taskId: string;
+			reason: string;
+		}
+
+		export interface TaskSettings {
+			type: 'broker:tasksettings';
+			taskId: string;
+			settings: unknown;
+		}
+
+		export interface RPCResponse {
+			type: 'broker:rpcresponse';
+			callId: string;
+			taskId: string;
+			status: 'success' | 'error';
+			data: unknown;
+		}
+
+		export interface TaskDataResponse {
+			type: 'broker:taskdataresponse';
+			taskId: string;
+			requestId: string;
+			data: unknown;
+		}
+
+		export type All =
+			| InfoRequest
+			| TaskOfferAccept
+			| TaskCancel
+			| TaskSettings
+			| RunnerRegistered
+			| RPCResponse
+			| TaskDataResponse;
+	}
+
+	export namespace ToRequester {
+		export interface TaskReady {
+			type: 'broker:taskready';
+			requestId: string;
+			taskId: string;
+		}
+
+		export interface TaskDone {
+			type: 'broker:taskdone';
+			taskId: string;
+			data: TaskResultData;
+		}
+
+		export interface TaskError {
+			type: 'broker:taskerror';
+			taskId: string;
+			error: unknown;
+		}
+
+		export interface TaskDataRequest {
+			type: 'broker:taskdatarequest';
+			taskId: string;
+			requestId: string;
+			requestType: DataRequestType;
+			param?: string;
+		}
+
+		export interface RPC {
+			type: 'broker:rpc';
+			callId: string;
+			taskId: string;
+			name: (typeof RPC_ALLOW_LIST)[number];
+			params: unknown[];
+		}
+
+		export type All = TaskReady | TaskDone | TaskError | TaskDataRequest | RPC;
+	}
+}
+
+export namespace RequesterMessage {
+	export namespace ToN8n {
+		export interface TaskSettings {
+			type: 'requester:tasksettings';
+			taskId: string;
+			settings: unknown;
+		}
+
+		export interface TaskCancel {
+			type: 'requester:taskcancel';
+			taskId: string;
+			reason: string;
+		}
+
+		export interface TaskDataResponse {
+			type: 'requester:taskdataresponse';
+			taskId: string;
+			requestId: string;
+			data: unknown;
+		}
+
+		export interface RPCResponse {
+			type: 'requester:rpcresponse';
+			taskId: string;
+			callId: string;
+			status: 'success' | 'error';
+			data: unknown;
+		}
+
+		export interface TaskRequest {
+			type: 'requester:taskrequest';
+			requestId: string;
+			taskType: string;
+		}
+
+		export type All = TaskSettings | TaskCancel | RPCResponse | TaskDataResponse | TaskRequest;
+	}
+}
+
+export namespace RunnerMessage {
+	export namespace ToN8n {
+		export interface Info {
+			type: 'runner:info';
+			name: string;
+			types: string[];
+		}
+
+		export interface TaskAccepted {
+			type: 'runner:taskaccepted';
+			taskId: string;
+		}
+
+		export interface TaskRejected {
+			type: 'runner:taskrejected';
+			taskId: string;
+			reason: string;
+		}
+
+		export interface TaskDone {
+			type: 'runner:taskdone';
+			taskId: string;
+			data: TaskResultData;
+		}
+
+		export interface TaskError {
+			type: 'runner:taskerror';
+			taskId: string;
+			error: unknown;
+		}
+
+		export interface TaskOffer {
+			type: 'runner:taskoffer';
+			offerId: string;
+			taskType: string;
+			validFor: number;
+		}
+
+		export interface TaskDataRequest {
+			type: 'runner:taskdatarequest';
+			taskId: string;
+			requestId: string;
+			requestType: DataRequestType;
+			param?: string;
+		}
+
+		export interface RPC {
+			type: 'runner:rpc';
+			callId: string;
+			taskId: string;
+			name: (typeof RPC_ALLOW_LIST)[number];
+			params: unknown[];
+		}
+
+		export type All =
+			| Info
+			| TaskDone
+			| TaskError
+			| TaskAccepted
+			| TaskRejected
+			| TaskOffer
+			| RPC
+			| TaskDataRequest;
+	}
+}
+
+export const RPC_ALLOW_LIST = [
+	'helpers.httpRequestWithAuthentication',
+	'helpers.requestWithAuthenticationPaginated',
+	// "helpers.normalizeItems"
+	// "helpers.constructExecutionMetaData"
+	// "helpers.assertBinaryData"
+	'helpers.getBinaryDataBuffer',
+	// "helpers.copyInputItems"
+	// "helpers.returnJsonArray"
+	'helpers.getSSHClient',
+	'helpers.createReadStream',
+	// "helpers.getStoragePath"
+	'helpers.writeContentToFile',
+	'helpers.prepareBinaryData',
+	'helpers.setBinaryDataBuffer',
+	'helpers.copyBinaryFile',
+	'helpers.binaryToBuffer',
+	// "helpers.binaryToString"
+	// "helpers.getBinaryPath"
+	'helpers.getBinaryStream',
+	'helpers.getBinaryMetadata',
+	'helpers.createDeferredPromise',
+	'helpers.httpRequest',
+	'logNodeOutput',
+] as const;
diff --git a/packages/@n8n/task-runner/src/start.ts b/packages/@n8n/task-runner/src/start.ts
new file mode 100644
index 0000000000..5f856140d9
--- /dev/null
+++ b/packages/@n8n/task-runner/src/start.ts
@@ -0,0 +1,83 @@
+import { ApplicationError, ensureError } from 'n8n-workflow';
+import * as a from 'node:assert/strict';
+
+import { authenticate } from './authenticator';
+import { JsTaskRunner } from './js-task-runner/js-task-runner';
+
+let runner: JsTaskRunner | undefined;
+let isShuttingDown = false;
+
+type Config = {
+	n8nUri: string;
+	authToken?: string;
+	grantToken?: string;
+};
+
+function readAndParseConfig(): Config {
+	const authToken = process.env.N8N_RUNNERS_AUTH_TOKEN;
+	const grantToken = process.env.N8N_RUNNERS_GRANT_TOKEN;
+	if (!authToken && !grantToken) {
+		throw new ApplicationError(
+			'Missing task runner authentication. Use either N8N_RUNNERS_AUTH_TOKEN or N8N_RUNNERS_GRANT_TOKEN to configure it',
+		);
+	}
+
+	return {
+		n8nUri: process.env.N8N_RUNNERS_N8N_URI ?? '127.0.0.1:5679',
+		authToken,
+		grantToken,
+	};
+}
+
+function createSignalHandler(signal: string) {
+	return async function onSignal() {
+		if (isShuttingDown) {
+			return;
+		}
+
+		console.log(`Received ${signal} signal, shutting down...`);
+
+		isShuttingDown = true;
+		try {
+			if (runner) {
+				await runner.stop();
+				runner = undefined;
+			}
+		} catch (e) {
+			const error = ensureError(e);
+			console.error('Error stopping task runner', { error });
+		} finally {
+			process.exit(0);
+		}
+	};
+}
+
+void (async function start() {
+	const config = readAndParseConfig();
+
+	let grantToken = config.grantToken;
+	if (!grantToken) {
+		a.ok(config.authToken);
+
+		grantToken = await authenticate({
+			authToken: config.authToken,
+			n8nUri: config.n8nUri,
+		});
+	}
+
+	const wsUrl = `ws://${config.n8nUri}/runners/_ws`;
+	runner = new JsTaskRunner({
+		wsUrl,
+		grantToken,
+		maxConcurrency: 5,
+		allowedBuiltInModules: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
+		allowedExternalModules: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
+	});
+
+	process.on('SIGINT', createSignalHandler('SIGINT'));
+	process.on('SIGTERM', createSignalHandler('SIGTERM'));
+})().catch((e) => {
+	const error = ensureError(e);
+	console.error('Task runner failed to start', { error });
+	process.exit(1);
+});
diff --git a/packages/@n8n/task-runner/src/task-runner.ts b/packages/@n8n/task-runner/src/task-runner.ts
new file mode 100644
index 0000000000..ac8378636a
--- /dev/null
+++ b/packages/@n8n/task-runner/src/task-runner.ts
@@ -0,0 +1,390 @@
+import { ApplicationError } from 'n8n-workflow';
+import { nanoid } from 'nanoid';
+import { URL } from 'node:url';
+import { type MessageEvent, WebSocket } from 'ws';
+
+import {
+	RPC_ALLOW_LIST,
+	type RunnerMessage,
+	type N8nMessage,
+	type TaskResultData,
+} from './runner-types';
+
+export interface Task<T = unknown> {
+	taskId: string;
+	settings?: T;
+	active: boolean;
+	cancelled: boolean;
+}
+
+export interface TaskOffer {
+	offerId: string;
+	validUntil: bigint;
+}
+
+interface DataRequest {
+	requestId: string;
+	resolve: (data: unknown) => void;
+	reject: (error: unknown) => void;
+}
+
+interface RPCCall {
+	callId: string;
+	resolve: (data: unknown) => void;
+	reject: (error: unknown) => void;
+}
+
+export interface RPCCallObject {
+	[name: string]: ((...args: unknown[]) => Promise<unknown>) | RPCCallObject;
+}
+
+const VALID_TIME_MS = 1000;
+const VALID_EXTRA_MS = 100;
+
+export abstract class TaskRunner {
+	id: string = nanoid();
+
+	ws: WebSocket;
+
+	canSendOffers = false;
+
+	runningTasks: Map<Task['taskId'], Task> = new Map();
+
+	offerInterval: NodeJS.Timeout | undefined;
+
+	openOffers: Map<TaskOffer['offerId'], TaskOffer> = new Map();
+
+	dataRequests: Map<DataRequest['requestId'], DataRequest> = new Map();
+
+	rpcCalls: Map<RPCCall['callId'], RPCCall> = new Map();
+
+	constructor(
+		public taskType: string,
+		wsUrl: string,
+		grantToken: string,
+		private maxConcurrency: number,
+		public name?: string,
+	) {
+		const url = new URL(wsUrl);
+		url.searchParams.append('id', this.id);
+		this.ws = new WebSocket(url.toString(), {
+			headers: {
+				authorization: `Bearer ${grantToken}`,
+			},
+		});
+		this.ws.addEventListener('message', this.receiveMessage);
+		this.ws.addEventListener('close', this.stopTaskOffers);
+	}
+
+	private receiveMessage = (message: MessageEvent) => {
+		// eslint-disable-next-line n8n-local-rules/no-uncaught-json-parse
+		const data = JSON.parse(message.data as string) as N8nMessage.ToRunner.All;
+		void this.onMessage(data);
+	};
+
+	private stopTaskOffers = () => {
+		this.canSendOffers = false;
+		if (this.offerInterval) {
+			clearInterval(this.offerInterval);
+			this.offerInterval = undefined;
+		}
+	};
+
+	private startTaskOffers() {
+		this.canSendOffers = true;
+		if (this.offerInterval) {
+			clearInterval(this.offerInterval);
+		}
+		this.offerInterval = setInterval(() => this.sendOffers(), 250);
+	}
+
+	deleteStaleOffers() {
+		this.openOffers.forEach((offer, key) => {
+			if (offer.validUntil < process.hrtime.bigint()) {
+				this.openOffers.delete(key);
+			}
+		});
+	}
+
+	sendOffers() {
+		this.deleteStaleOffers();
+
+		const offersToSend =
+			this.maxConcurrency -
+			(Object.values(this.openOffers).length + Object.values(this.runningTasks).length);
+
+		for (let i = 0; i < offersToSend; i++) {
+			const offer: TaskOffer = {
+				offerId: nanoid(),
+				validUntil: process.hrtime.bigint() + BigInt((VALID_TIME_MS + VALID_EXTRA_MS) * 1_000_000), // Adding a little extra time to account for latency
+			};
+			this.openOffers.set(offer.offerId, offer);
+			this.send({
+				type: 'runner:taskoffer',
+				taskType: this.taskType,
+				offerId: offer.offerId,
+				validFor: VALID_TIME_MS,
+			});
+		}
+	}
+
+	send(message: RunnerMessage.ToN8n.All) {
+		this.ws.send(JSON.stringify(message));
+	}
+
+	onMessage(message: N8nMessage.ToRunner.All) {
+		switch (message.type) {
+			case 'broker:inforequest':
+				this.send({
+					type: 'runner:info',
+					name: this.name ?? 'Node.js Task Runner SDK',
+					types: [this.taskType],
+				});
+				break;
+			case 'broker:runnerregistered':
+				this.startTaskOffers();
+				break;
+			case 'broker:taskofferaccept':
+				this.offerAccepted(message.offerId, message.taskId);
+				break;
+			case 'broker:taskcancel':
+				this.taskCancelled(message.taskId);
+				break;
+			case 'broker:tasksettings':
+				void this.receivedSettings(message.taskId, message.settings);
+				break;
+			case 'broker:taskdataresponse':
+				this.processDataResponse(message.requestId, message.data);
+				break;
+			case 'broker:rpcresponse':
+				this.handleRpcResponse(message.callId, message.status, message.data);
+		}
+	}
+
+	processDataResponse(requestId: string, data: unknown) {
+		const request = this.dataRequests.get(requestId);
+		if (!request) {
+			return;
+		}
+		// Deleting of the request is handled in `requestData`, using a
+		// `finally` wrapped around the return
+		request.resolve(data);
+	}
+
+	hasOpenTasks() {
+		return Object.values(this.runningTasks).length < this.maxConcurrency;
+	}
+
+	offerAccepted(offerId: string, taskId: string) {
+		if (!this.hasOpenTasks()) {
+			this.send({
+				type: 'runner:taskrejected',
+				taskId,
+				reason: 'No open task slots',
+			});
+			return;
+		}
+		const offer = this.openOffers.get(offerId);
+		if (!offer) {
+			this.send({
+				type: 'runner:taskrejected',
+				taskId,
+				reason: 'Offer expired and no open task slots',
+			});
+			return;
+		} else {
+			this.openOffers.delete(offerId);
+		}
+
+		this.runningTasks.set(taskId, {
+			taskId,
+			active: false,
+			cancelled: false,
+		});
+
+		this.send({
+			type: 'runner:taskaccepted',
+			taskId,
+		});
+	}
+
+	taskCancelled(taskId: string) {
+		const task = this.runningTasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		task.cancelled = true;
+		if (task.active) {
+			// TODO
+		} else {
+			this.runningTasks.delete(taskId);
+		}
+		this.sendOffers();
+	}
+
+	taskErrored(taskId: string, error: unknown) {
+		this.send({
+			type: 'runner:taskerror',
+			taskId,
+			error,
+		});
+		this.runningTasks.delete(taskId);
+		this.sendOffers();
+	}
+
+	taskDone(taskId: string, data: RunnerMessage.ToN8n.TaskDone['data']) {
+		this.send({
+			type: 'runner:taskdone',
+			taskId,
+			data,
+		});
+		this.runningTasks.delete(taskId);
+		this.sendOffers();
+	}
+
+	async receivedSettings(taskId: string, settings: unknown) {
+		const task = this.runningTasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		if (task.cancelled) {
+			this.runningTasks.delete(taskId);
+			return;
+		}
+		task.settings = settings;
+		task.active = true;
+		try {
+			const data = await this.executeTask(task);
+			this.taskDone(taskId, data);
+		} catch (error) {
+			this.taskErrored(taskId, error);
+		}
+	}
+
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	async executeTask(_task: Task): Promise<TaskResultData> {
+		throw new ApplicationError('Unimplemented');
+	}
+
+	async requestData<T = unknown>(
+		taskId: Task['taskId'],
+		type: RunnerMessage.ToN8n.TaskDataRequest['requestType'],
+		param?: string,
+	): Promise<T> {
+		const requestId = nanoid();
+
+		const p = new Promise<T>((resolve, reject) => {
+			this.dataRequests.set(requestId, {
+				requestId,
+				resolve: resolve as (data: unknown) => void,
+				reject,
+			});
+		});
+
+		this.send({
+			type: 'runner:taskdatarequest',
+			taskId,
+			requestId,
+			requestType: type,
+			param,
+		});
+
+		try {
+			return await p;
+		} finally {
+			this.dataRequests.delete(requestId);
+		}
+	}
+
+	async makeRpcCall(taskId: string, name: RunnerMessage.ToN8n.RPC['name'], params: unknown[]) {
+		const callId = nanoid();
+
+		const dataPromise = new Promise((resolve, reject) => {
+			this.rpcCalls.set(callId, {
+				callId,
+				resolve,
+				reject,
+			});
+		});
+
+		this.send({
+			type: 'runner:rpc',
+			callId,
+			taskId,
+			name,
+			params,
+		});
+
+		try {
+			return await dataPromise;
+		} finally {
+			this.rpcCalls.delete(callId);
+		}
+	}
+
+	handleRpcResponse(
+		callId: string,
+		status: N8nMessage.ToRunner.RPCResponse['status'],
+		data: unknown,
+	) {
+		const call = this.rpcCalls.get(callId);
+		if (!call) {
+			return;
+		}
+		if (status === 'success') {
+			call.resolve(data);
+		} else {
+			call.reject(typeof data === 'string' ? new Error(data) : data);
+		}
+	}
+
+	buildRpcCallObject(taskId: string) {
+		const rpcObject: RPCCallObject = {};
+		for (const r of RPC_ALLOW_LIST) {
+			const splitPath = r.split('.');
+			let obj = rpcObject;
+
+			splitPath.forEach((s, index) => {
+				if (index !== splitPath.length - 1) {
+					obj[s] = {};
+					obj = obj[s];
+					return;
+				}
+				obj[s] = async (...args: unknown[]) => await this.makeRpcCall(taskId, r, args);
+			});
+		}
+		return rpcObject;
+	}
+
+	/** Close the connection gracefully and wait until has been closed */
+	async stop() {
+		this.stopTaskOffers();
+
+		await this.waitUntilAllTasksAreDone();
+
+		await this.closeConnection();
+	}
+
+	private async closeConnection() {
+		// 1000 is the standard close code
+		// https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
+		this.ws.close(1000, 'Shutting down');
+
+		await new Promise((resolve) => {
+			this.ws.once('close', resolve);
+		});
+	}
+
+	private async waitUntilAllTasksAreDone(maxWaitTimeInMs = 30_000) {
+		// TODO: Make maxWaitTimeInMs configurable
+		const start = Date.now();
+
+		while (this.runningTasks.size > 0) {
+			if (Date.now() - start > maxWaitTimeInMs) {
+				throw new ApplicationError('Timeout while waiting for tasks to finish');
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+		}
+	}
+}
diff --git a/packages/@n8n/task-runner/tsconfig.build.json b/packages/@n8n/task-runner/tsconfig.build.json
new file mode 100644
index 0000000000..59065a1e2b
--- /dev/null
+++ b/packages/@n8n/task-runner/tsconfig.build.json
@@ -0,0 +1,11 @@
+{
+	"extends": ["./tsconfig.json", "../../../tsconfig.build.json"],
+	"compilerOptions": {
+		"composite": true,
+		"rootDir": "src",
+		"outDir": "dist",
+		"tsBuildInfoFile": "dist/build.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts"],
+	"exclude": ["src/**/__tests__/**"]
+}
diff --git a/packages/@n8n/task-runner/tsconfig.json b/packages/@n8n/task-runner/tsconfig.json
new file mode 100644
index 0000000000..db6ad545e3
--- /dev/null
+++ b/packages/@n8n/task-runner/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"extends": ["../../../tsconfig.json", "../../../tsconfig.backend.json"],
+	"compilerOptions": {
+		"rootDir": ".",
+		"baseUrl": "src",
+		"paths": {
+			"@/*": ["./*"]
+		},
+		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts"]
+}
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index a3a1e612ab..6002da5caa 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -71,5 +71,11 @@ module.exports = {
 				],
 			},
 		},
+		{
+			files: ['./test/**/*.ts', './src/**/__tests__/**/*.ts'],
+			rules: {
+				'n8n-local-rules/no-dynamic-import-template': 'off',
+			},
+		},
 	],
 };
diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 869ace642e..bdb1ff5890 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,28 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+# 1.63.0
+
+### What changed?
+
+1. The worker server used to bind to IPv6 by default. It now binds to IPv4 by default.
+2. The worker server's `/healthz` used to report healthy status based on database and Redis checks. It now reports healthy status regardless of database and Redis status, and the database and Redis checks are part of `/healthz/readiness`.
+
+### When is action necessary?
+
+1. If you experience a port conflict error when starting a worker server using its default port, set a different port for the worker server with `QUEUE_HEALTH_CHECK_PORT`.
+2. If you are relying on database and Redis checks for worker health status, switch to checking `/healthz/readiness` instead of `/healthz`.
+
+## 1.57.0
+
+### What changed?
+
+The `verbose` log level was merged into the `debug` log level.
+
+### When is action necessary?
+
+If you are setting the env var `N8N_LOG_LEVEL=verbose`, please update your log level to `N8N_LOG_LEVEL=debug`.
+
 ## 1.55.0
 
 ### What changed?
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3b03bbf0ab..9e80eb34c2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.61.0",
+  "version": "1.63.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -51,13 +51,13 @@
     "!dist/**/e2e.*"
   ],
   "devDependencies": {
-    "@redocly/cli": "^1.6.0",
+    "@redocly/cli": "^1.25.5",
     "@types/archiver": "^6.0.2",
     "@types/aws4": "^1.5.1",
     "@types/bcryptjs": "^2.4.2",
     "@types/compression": "1.0.1",
     "@types/convict": "^6.1.1",
-    "@types/cookie-parser": "^1.4.2",
+    "@types/cookie-parser": "^1.4.7",
     "@types/express": "catalog:",
     "@types/flat": "^5.0.5",
     "@types/formidable": "^3.4.5",
@@ -78,7 +78,6 @@
     "@types/xml2js": "catalog:",
     "@types/yamljs": "^0.2.31",
     "@vvo/tzdb": "^6.141.0",
-    "chokidar": "^3.5.2",
     "concurrently": "^8.2.0",
     "ioredis-mock": "^8.8.1",
     "mjml": "^4.15.3",
@@ -94,8 +93,9 @@
     "@n8n/localtunnel": "3.0.0",
     "@n8n/n8n-nodes-langchain": "workspace:*",
     "@n8n/permissions": "workspace:*",
-    "@n8n/typeorm": "0.3.20-10",
-    "@n8n_io/ai-assistant-sdk": "1.9.4",
+    "@n8n/task-runner": "workspace:*",
+    "@n8n/typeorm": "0.3.20-12",
+    "@n8n_io/ai-assistant-sdk": "1.10.3",
     "@n8n_io/license-sdk": "2.13.1",
     "@oclif/core": "4.0.7",
     "@rudderstack/rudder-sdk-node": "2.0.9",
@@ -114,14 +114,14 @@
     "class-validator": "0.14.0",
     "compression": "1.7.4",
     "convict": "6.2.4",
-    "cookie-parser": "1.4.6",
+    "cookie-parser": "1.4.7",
     "csrf": "3.1.0",
     "curlconverter": "3.21.0",
     "dotenv": "8.6.0",
-    "express": "4.21.0",
+    "express": "4.21.1",
     "express-async-errors": "3.1.1",
     "express-handlebars": "7.1.2",
-    "express-openapi-validator": "5.3.3",
+    "express-openapi-validator": "5.3.7",
     "express-prom-bundle": "6.6.0",
     "express-rate-limit": "7.2.0",
     "fast-glob": "catalog:",
@@ -148,7 +148,7 @@
     "nodemailer": "6.9.9",
     "oauth-1.0a": "2.2.6",
     "open": "7.4.2",
-    "openapi-types": "10.0.0",
+    "openapi-types": "12.1.3",
     "otpauth": "9.1.1",
     "p-cancelable": "2.1.1",
     "p-lazy": "3.1.0",
@@ -167,16 +167,15 @@
     "simple-git": "3.17.0",
     "source-map-support": "0.5.21",
     "sqlite3": "5.1.7",
-    "sse-channel": "4.0.0",
     "sshpk": "1.17.0",
-    "swagger-ui-express": "5.0.0",
+    "swagger-ui-express": "5.0.1",
     "syslog-client": "1.1.1",
     "tar-stream": "^3.1.7",
     "typedi": "catalog:",
     "unzip-stream": "0.3.4",
     "uuid": "catalog:",
     "validator": "13.7.0",
-    "winston": "3.8.2",
+    "winston": "3.14.2",
     "ws": "8.17.1",
     "xml2js": "catalog:",
     "xmllint-wasm": "3.0.1",
diff --git a/packages/cli/src/__tests__/license.test.ts b/packages/cli/src/__tests__/license.test.ts
index 6f2e06752f..67a92b95cd 100644
--- a/packages/cli/src/__tests__/license.test.ts
+++ b/packages/cli/src/__tests__/license.test.ts
@@ -5,7 +5,7 @@ import type { InstanceSettings } from 'n8n-core';
 import config from '@/config';
 import { N8N_VERSION } from '@/constants';
 import { License } from '@/license';
-import type { Logger } from '@/logger';
+import { mockLogger } from '@test/mocking';
 
 jest.mock('@n8n_io/license-sdk');
 
@@ -25,37 +25,39 @@ describe('License', () => {
 	});
 
 	let license: License;
-	const logger = mock<Logger>();
 	const instanceSettings = mock<InstanceSettings>({
 		instanceId: MOCK_INSTANCE_ID,
 		instanceType: 'main',
 	});
 
 	beforeEach(async () => {
-		license = new License(logger, instanceSettings, mock(), mock(), mock());
+		license = new License(mockLogger(), instanceSettings, mock(), mock(), mock());
 		await license.init();
 	});
 
 	test('initializes license manager', async () => {
-		expect(LicenseManager).toHaveBeenCalledWith({
-			autoRenewEnabled: true,
-			autoRenewOffset: MOCK_RENEW_OFFSET,
-			offlineMode: false,
-			renewOnInit: true,
-			deviceFingerprint: expect.any(Function),
-			productIdentifier: `n8n-${N8N_VERSION}`,
-			logger,
-			loadCertStr: expect.any(Function),
-			saveCertStr: expect.any(Function),
-			onFeatureChange: expect.any(Function),
-			collectUsageMetrics: expect.any(Function),
-			collectPassthroughData: expect.any(Function),
-			server: MOCK_SERVER_URL,
-			tenantId: 1,
-		});
+		expect(LicenseManager).toHaveBeenCalledWith(
+			expect.objectContaining({
+				autoRenewEnabled: true,
+				autoRenewOffset: MOCK_RENEW_OFFSET,
+				offlineMode: false,
+				renewOnInit: true,
+				deviceFingerprint: expect.any(Function),
+				productIdentifier: `n8n-${N8N_VERSION}`,
+				loadCertStr: expect.any(Function),
+				saveCertStr: expect.any(Function),
+				onFeatureChange: expect.any(Function),
+				collectUsageMetrics: expect.any(Function),
+				collectPassthroughData: expect.any(Function),
+				server: MOCK_SERVER_URL,
+				tenantId: 1,
+			}),
+		);
 	});
 
 	test('initializes license manager for worker', async () => {
+		const logger = mockLogger();
+
 		license = new License(
 			logger,
 			mock<InstanceSettings>({ instanceType: 'worker' }),
@@ -64,22 +66,23 @@ describe('License', () => {
 			mock(),
 		);
 		await license.init();
-		expect(LicenseManager).toHaveBeenCalledWith({
-			autoRenewEnabled: false,
-			autoRenewOffset: MOCK_RENEW_OFFSET,
-			offlineMode: true,
-			renewOnInit: false,
-			deviceFingerprint: expect.any(Function),
-			productIdentifier: `n8n-${N8N_VERSION}`,
-			logger,
-			loadCertStr: expect.any(Function),
-			saveCertStr: expect.any(Function),
-			onFeatureChange: expect.any(Function),
-			collectUsageMetrics: expect.any(Function),
-			collectPassthroughData: expect.any(Function),
-			server: MOCK_SERVER_URL,
-			tenantId: 1,
-		});
+		expect(LicenseManager).toHaveBeenCalledWith(
+			expect.objectContaining({
+				autoRenewEnabled: false,
+				autoRenewOffset: MOCK_RENEW_OFFSET,
+				offlineMode: true,
+				renewOnInit: false,
+				deviceFingerprint: expect.any(Function),
+				productIdentifier: `n8n-${N8N_VERSION}`,
+				loadCertStr: expect.any(Function),
+				saveCertStr: expect.any(Function),
+				onFeatureChange: expect.any(Function),
+				collectUsageMetrics: expect.any(Function),
+				collectPassthroughData: expect.any(Function),
+				server: MOCK_SERVER_URL,
+				tenantId: 1,
+			}),
+		);
 	});
 
 	test('attempts to activate license with provided key', async () => {
@@ -196,7 +199,7 @@ describe('License', () => {
 				it('should enable renewal', async () => {
 					config.set('multiMainSetup.enabled', false);
 
-					await new License(mock(), mock(), mock(), mock(), mock()).init();
+					await new License(mockLogger(), mock(), mock(), mock(), mock()).init();
 
 					expect(LicenseManager).toHaveBeenCalledWith(
 						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
@@ -208,7 +211,7 @@ describe('License', () => {
 				it('should disable renewal', async () => {
 					config.set('license.autoRenewEnabled', false);
 
-					await new License(mock(), mock(), mock(), mock(), mock()).init();
+					await new License(mockLogger(), mock(), mock(), mock(), mock()).init();
 
 					expect(LicenseManager).toHaveBeenCalledWith(
 						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
@@ -226,7 +229,7 @@ describe('License', () => {
 						config.set('multiMainSetup.instanceType', status);
 						config.set('license.autoRenewEnabled', false);
 
-						await new License(mock(), mock(), mock(), mock(), mock()).init();
+						await new License(mockLogger(), mock(), mock(), mock(), mock()).init();
 
 						expect(LicenseManager).toHaveBeenCalledWith(
 							expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
@@ -241,7 +244,7 @@ describe('License', () => {
 					config.set('multiMainSetup.instanceType', status);
 					config.set('license.autoRenewEnabled', false);
 
-					await new License(mock(), mock(), mock(), mock(), mock()).init();
+					await new License(mockLogger(), mock(), mock(), mock(), mock()).init();
 
 					expect(LicenseManager).toHaveBeenCalledWith(
 						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
@@ -252,7 +255,7 @@ describe('License', () => {
 					config.set('multiMainSetup.enabled', true);
 					config.set('multiMainSetup.instanceType', 'leader');
 
-					await new License(mock(), mock(), mock(), mock(), mock()).init();
+					await new License(mockLogger(), mock(), mock(), mock(), mock()).init();
 
 					expect(LicenseManager).toHaveBeenCalledWith(
 						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
@@ -264,7 +267,7 @@ describe('License', () => {
 
 	describe('reinit', () => {
 		it('should reinitialize license manager', async () => {
-			const license = new License(mock(), mock(), mock(), mock(), mock());
+			const license = new License(mockLogger(), mock(), mock(), mock(), mock());
 			await license.init();
 
 			const initSpy = jest.spyOn(license, 'init');
diff --git a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
new file mode 100644
index 0000000000..bcf485445f
--- /dev/null
+++ b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
@@ -0,0 +1,37 @@
+import { mock } from 'jest-mock-extended';
+import type { DirectoryLoader } from 'n8n-core';
+
+import { LoadNodesAndCredentials } from '../load-nodes-and-credentials';
+
+describe('LoadNodesAndCredentials', () => {
+	describe('resolveIcon', () => {
+		let instance: LoadNodesAndCredentials;
+
+		beforeEach(() => {
+			instance = new LoadNodesAndCredentials(mock(), mock(), mock());
+			instance.loaders.package1 = mock<DirectoryLoader>({
+				directory: '/icons/package1',
+			});
+		});
+
+		it('should return undefined if the loader for the package is not found', () => {
+			const result = instance.resolveIcon('unknownPackage', '/icons/unknownPackage/icon.png');
+			expect(result).toBeUndefined();
+		});
+
+		it('should return undefined if the resolved file path is outside the loader directory', () => {
+			const result = instance.resolveIcon('package1', '/some/other/path/icon.png');
+			expect(result).toBeUndefined();
+		});
+
+		it('should return the file path if the file is within the loader directory', () => {
+			const result = instance.resolveIcon('package1', '/icons/package1/icon.png');
+			expect(result).toBe('/icons/package1/icon.png');
+		});
+
+		it('should return undefined if the URL is outside the package directory', () => {
+			const result = instance.resolveIcon('package1', '/icons/package1/../../../etc/passwd');
+			expect(result).toBeUndefined();
+		});
+	});
+});
diff --git a/packages/cli/src/__tests__/wait-tracker.test.ts b/packages/cli/src/__tests__/wait-tracker.test.ts
index 9ca3a66d33..8f9f31da00 100644
--- a/packages/cli/src/__tests__/wait-tracker.test.ts
+++ b/packages/cli/src/__tests__/wait-tracker.test.ts
@@ -5,6 +5,7 @@ import type { IExecutionResponse } from '@/interfaces';
 import type { MultiMainSetup } from '@/services/orchestration/main/multi-main-setup.ee';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { WaitTracker } from '@/wait-tracker';
+import { mockLogger } from '@test/mocking';
 
 jest.useFakeTimers();
 
@@ -21,7 +22,7 @@ describe('WaitTracker', () => {
 	let waitTracker: WaitTracker;
 	beforeEach(() => {
 		waitTracker = new WaitTracker(
-			mock(),
+			mockLogger(),
 			executionRepository,
 			mock(),
 			mock(),
diff --git a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts
index 6b715f175d..88aee51540 100644
--- a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts
+++ b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts
@@ -1,21 +1,80 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	IExecuteWorkflowInfo,
+	IWorkflowExecuteAdditionalData,
+	ExecuteWorkflowOptions,
+	IRun,
+} from 'n8n-workflow';
+import type PCancelable from 'p-cancelable';
 import Container from 'typedi';
 
+import { ActiveExecutions } from '@/active-executions';
 import { CredentialsHelper } from '@/credentials-helper';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { VariablesService } from '@/environments/variables/variables.service.ee';
 import { EventService } from '@/events/event.service';
+import { ExternalHooks } from '@/external-hooks';
 import { SecretsHelper } from '@/secrets-helpers';
-import { getBase } from '@/workflow-execute-additional-data';
+import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
+import { SubworkflowPolicyChecker } from '@/subworkflows/subworkflow-policy-checker.service';
+import { Telemetry } from '@/telemetry';
+import { PermissionChecker } from '@/user-management/permission-checker';
+import { executeWorkflow, getBase } from '@/workflow-execute-additional-data';
 import { mockInstance } from '@test/mocking';
 
+const run = mock<IRun>({
+	data: { resultData: {} },
+	finished: true,
+	mode: 'manual',
+	startedAt: new Date(),
+	status: 'new',
+});
+
+const cancelablePromise = mock<PCancelable<IRun>>({
+	then: jest
+		.fn()
+		.mockImplementation(async (onfulfilled) => await Promise.resolve(run).then(onfulfilled)),
+	catch: jest
+		.fn()
+		.mockImplementation(async (onrejected) => await Promise.resolve(run).catch(onrejected)),
+	finally: jest
+		.fn()
+		.mockImplementation(async (onfinally) => await Promise.resolve(run).finally(onfinally)),
+	[Symbol.toStringTag]: 'PCancelable',
+});
+
+jest.mock('n8n-core', () => ({
+	__esModule: true,
+	...jest.requireActual('n8n-core'),
+	WorkflowExecute: jest.fn().mockImplementation(() => ({
+		processRunExecutionData: jest.fn().mockReturnValue(cancelablePromise),
+	})),
+}));
+
+jest.mock('../workflow-helpers', () => ({
+	...jest.requireActual('../workflow-helpers'),
+	getDataLastExecutedNodeData: jest.fn().mockReturnValue({ data: { main: [] } }),
+}));
+
 describe('WorkflowExecuteAdditionalData', () => {
 	const variablesService = mockInstance(VariablesService);
 	variablesService.getAllCached.mockResolvedValue([]);
 	const credentialsHelper = mockInstance(CredentialsHelper);
 	const secretsHelper = mockInstance(SecretsHelper);
 	const eventService = mockInstance(EventService);
+	mockInstance(ExternalHooks);
 	Container.set(VariablesService, variablesService);
 	Container.set(CredentialsHelper, credentialsHelper);
 	Container.set(SecretsHelper, secretsHelper);
+	const executionRepository = mockInstance(ExecutionRepository);
+	mockInstance(Telemetry);
+	const workflowRepository = mockInstance(WorkflowRepository);
+	const activeExecutions = mockInstance(ActiveExecutions);
+	mockInstance(PermissionChecker);
+	mockInstance(SubworkflowPolicyChecker);
+	mockInstance(WorkflowStatisticsService);
 
 	test('logAiEvent should call MessageEventBus', async () => {
 		const additionalData = await getBase('user-id');
@@ -35,4 +94,18 @@ describe('WorkflowExecuteAdditionalData', () => {
 		expect(eventService.emit).toHaveBeenCalledTimes(1);
 		expect(eventService.emit).toHaveBeenCalledWith(eventName, payload);
 	});
+
+	it('`executeWorkflow` should set subworkflow execution as running', async () => {
+		const executionId = '123';
+		workflowRepository.get.mockResolvedValue(mock<WorkflowEntity>({ id: executionId, nodes: [] }));
+		activeExecutions.add.mockResolvedValue(executionId);
+
+		await executeWorkflow(
+			mock<IExecuteWorkflowInfo>(),
+			mock<IWorkflowExecuteAdditionalData>(),
+			mock<ExecuteWorkflowOptions>({ loadedWorkflowData: undefined }),
+		);
+
+		expect(executionRepository.setRunning).toHaveBeenCalledWith(executionId);
+	});
 });
diff --git a/packages/cli/src/abstract-server.ts b/packages/cli/src/abstract-server.ts
index 3c60a3e48d..95ecaccdc5 100644
--- a/packages/cli/src/abstract-server.ts
+++ b/packages/cli/src/abstract-server.ts
@@ -13,7 +13,7 @@ import { N8N_VERSION, TEMPLATES_DIR, inDevelopment, inTest } from '@/constants';
 import * as Db from '@/db';
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { ExternalHooks } from '@/external-hooks';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares';
 import { send, sendErrorResponse } from '@/response-helper';
 import { WaitingForms } from '@/waiting-forms';
diff --git a/packages/cli/src/active-executions.ts b/packages/cli/src/active-executions.ts
index 8f7661925b..f5835ca164 100644
--- a/packages/cli/src/active-executions.ts
+++ b/packages/cli/src/active-executions.ts
@@ -13,12 +13,12 @@ import { Service } from 'typedi';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { ExecutionNotFoundError } from '@/errors/execution-not-found-error';
 import type {
-	ExecutionPayload,
+	CreateExecutionPayload,
 	IExecutingWorkflowData,
 	IExecutionDb,
 	IExecutionsCurrentSummary,
 } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { isWorkflowIdValid } from '@/utils';
 
 import { ConcurrencyControlService } from './concurrency/concurrency-control.service';
@@ -52,11 +52,10 @@ export class ActiveExecutions {
 		if (executionId === undefined) {
 			// Is a new execution so save in DB
 
-			const fullExecutionData: ExecutionPayload = {
+			const fullExecutionData: CreateExecutionPayload = {
 				data: executionData.executionData!,
 				mode,
 				finished: false,
-				startedAt: new Date(),
 				workflowData: executionData.workflowData,
 				status: executionStatus,
 				workflowId: executionData.workflowData.id,
@@ -74,7 +73,10 @@ export class ActiveExecutions {
 			executionId = await this.executionRepository.createNewExecution(fullExecutionData);
 			assert(executionId);
 
-			await this.concurrencyControl.throttle({ mode, executionId });
+			if (config.getEnv('executions.mode') === 'regular') {
+				await this.concurrencyControl.throttle({ mode, executionId });
+				await this.executionRepository.setRunning(executionId);
+			}
 			executionStatus = 'running';
 		} else {
 			// Is an existing execution we want to finish so update in DB
@@ -86,6 +88,7 @@ export class ActiveExecutions {
 				data: executionData.executionData!,
 				waitTill: null,
 				status: executionStatus,
+				// this is resuming, so keep `startedAt` as it was
 			};
 
 			await this.executionRepository.updateExistingExecution(executionId, execution);
diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts
index 44172ef564..9c5ef15f38 100644
--- a/packages/cli/src/active-workflow-manager.ts
+++ b/packages/cli/src/active-workflow-manager.ts
@@ -37,6 +37,7 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { ExternalHooks } from '@/external-hooks';
 import type { IWorkflowDb } from '@/interfaces';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import { ActiveWorkflowsService } from '@/services/active-workflows.service';
 import { OrchestrationService } from '@/services/orchestration.service';
@@ -47,7 +48,6 @@ import { WorkflowExecutionService } from '@/workflows/workflow-execution.service
 import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
 
 import { ExecutionService } from './executions/execution.service';
-import { Logger } from './logger';
 
 interface QueuedActivation {
 	activationMode: WorkflowActivateMode;
@@ -750,7 +750,7 @@ export class ActiveWorkflowManager {
 		const wasRemoved = await this.activeWorkflows.remove(workflowId);
 
 		if (wasRemoved) {
-			this.logger.warn(`Removed triggers and pollers for workflow "${workflowId}"`, {
+			this.logger.debug(`Removed triggers and pollers for workflow "${workflowId}"`, {
 				workflowId,
 			});
 		}
diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts
index 481f25c897..989396df84 100644
--- a/packages/cli/src/auth/auth.service.ts
+++ b/packages/cli/src/auth/auth.service.ts
@@ -12,7 +12,7 @@ import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import type { AuthenticatedRequest } from '@/requests';
 import { JwtService } from '@/services/jwt.service';
 import { UrlService } from '@/services/url.service';
diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index 857ca231d4..f4d97a6a05 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -1,8 +1,18 @@
 import 'reflect-metadata';
 import { GlobalConfig } from '@n8n/config';
 import { Command, Errors } from '@oclif/core';
-import { BinaryDataService, InstanceSettings, ObjectStoreService } from 'n8n-core';
-import { ApplicationError, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
+import {
+	BinaryDataService,
+	InstanceSettings,
+	ObjectStoreService,
+	DataDeduplicationService,
+} from 'n8n-core';
+import {
+	ApplicationError,
+	ensureError,
+	ErrorReporterProxy as ErrorReporter,
+	sleep,
+} from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import type { AbstractServer } from '@/abstract-server';
@@ -11,15 +21,16 @@ import { LICENSE_FEATURES, inDevelopment, inTest } from '@/constants';
 import * as CrashJournal from '@/crash-journal';
 import { generateHostInstanceId } from '@/databases/utils/generators';
 import * as Db from '@/db';
+import { getDataDeduplicationService } from '@/deduplication';
 import { initErrorHandling } from '@/error-reporting';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
-import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
+import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay';
 import { initExpressionEvaluator } from '@/expression-evaluator';
 import { ExternalHooks } from '@/external-hooks';
 import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import { PostHogClient } from '@/posthog';
 import { ShutdownService } from '@/shutdown/shutdown.service';
@@ -261,6 +272,11 @@ export abstract class BaseCommand extends Command {
 		await Container.get(BinaryDataService).init(binaryDataConfig);
 	}
 
+	protected async initDataDeduplicationService() {
+		const dataDeduplicationService = getDataDeduplicationService();
+		await DataDeduplicationService.init(dataDeduplicationService);
+	}
+
 	async initExternalHooks() {
 		this.externalHooks = Container.get(ExternalHooks);
 		await this.externalHooks.init();
@@ -283,8 +299,9 @@ export abstract class BaseCommand extends Command {
 				this.logger.debug('Attempting license activation');
 				await this.license.activate(activationKey);
 				this.logger.debug('License init complete');
-			} catch (e) {
-				this.logger.error('Could not activate license', e as Error);
+			} catch (e: unknown) {
+				const error = ensureError(e);
+				this.logger.error('Could not activate license', { error });
 			}
 		}
 	}
diff --git a/packages/cli/src/commands/db/__tests__/revert.test.ts b/packages/cli/src/commands/db/__tests__/revert.test.ts
index 9c7a37b533..ce3911b2b6 100644
--- a/packages/cli/src/commands/db/__tests__/revert.test.ts
+++ b/packages/cli/src/commands/db/__tests__/revert.test.ts
@@ -4,7 +4,7 @@ import { mock } from 'jest-mock-extended';
 
 import { main } from '@/commands/db/revert';
 import type { IrreversibleMigration, ReversibleMigration } from '@/databases/types';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { mockInstance } from '@test/mocking';
 
 const logger = mockInstance(Logger);
@@ -170,3 +170,38 @@ test('revert the last migration if it has a down migration', async () => {
 	expect(dataSource.undoLastMigration).toHaveBeenCalled();
 	expect(dataSource.destroy).toHaveBeenCalled();
 });
+
+test("don't use transaction if the last migration has transaction = false", async () => {
+	//
+	// ARRANGE
+	//
+	class TestMigration implements ReversibleMigration {
+		name = 'ReversibleMigration';
+
+		transaction = false as const;
+
+		async up() {}
+
+		async down() {}
+	}
+
+	const migrationsInDb: Migration[] = [
+		{ id: 1, timestamp: Date.now(), name: 'ReversibleMigration' },
+	];
+	const dataSource = mock<DataSource>({ migrations: [new TestMigration()] });
+
+	const migrationExecutor = mock<MigrationExecutor>();
+	migrationExecutor.getExecutedMigrations.mockResolvedValue(migrationsInDb);
+
+	//
+	// ACT
+	//
+	await main(logger, dataSource, migrationExecutor);
+
+	//
+	// ASSERT
+	//
+	expect(dataSource.undoLastMigration).toHaveBeenCalledWith({
+		transaction: 'none',
+	});
+});
diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts
index dc3776a6af..4510044405 100644
--- a/packages/cli/src/commands/db/revert.ts
+++ b/packages/cli/src/commands/db/revert.ts
@@ -8,7 +8,7 @@ import { Container } from 'typedi';
 import { getConnectionOptions } from '@/databases/config';
 import type { Migration } from '@/databases/types';
 import { wrapMigration } from '@/databases/utils/migration-helpers';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 // This function is extracted to make it easier to unit test it.
 // Mocking turned into a mess due to this command using typeorm and the db
@@ -55,7 +55,9 @@ export async function main(
 		return;
 	}
 
-	await connection.undoLastMigration();
+	await connection.undoLastMigration({
+		transaction: lastMigrationInstance.transaction === false ? 'none' : 'each',
+	});
 	await connection.destroy();
 }
 
diff --git a/packages/cli/src/commands/execute-batch.ts b/packages/cli/src/commands/execute-batch.ts
index 71540952b5..fbbecd2cbb 100644
--- a/packages/cli/src/commands/execute-batch.ts
+++ b/packages/cli/src/commands/execute-batch.ts
@@ -167,6 +167,7 @@ export class ExecuteBatch extends BaseCommand {
 	async init() {
 		await super.init();
 		await this.initBinaryDataService();
+		await this.initDataDeduplicationService();
 		await this.initExternalHooks();
 	}
 
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index 9a901fdfc5..fd49a2b619 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -31,6 +31,7 @@ export class Execute extends BaseCommand {
 	async init() {
 		await super.init();
 		await this.initBinaryDataService();
+		await this.initDataDeduplicationService();
 		await this.initExternalHooks();
 	}
 
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index a8d9cee882..a1d8314ec6 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -23,9 +23,11 @@ import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'
 import { EventService } from '@/events/event.service';
 import { ExecutionService } from '@/executions/execution.service';
 import { License } from '@/license';
-import { Publisher } from '@/scaling/pubsub/publisher.service';
+import { SingleMainTaskManager } from '@/runners/task-managers/single-main-task-manager';
+import { TaskManager } from '@/runners/task-managers/task-manager';
+import { PubSubHandler } from '@/scaling/pubsub/pubsub-handler';
+import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import { Server } from '@/server';
-import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { PruningService } from '@/services/pruning.service';
@@ -212,6 +214,8 @@ export class Start extends BaseCommand {
 		this.logger.debug('Wait tracker init complete');
 		await this.initBinaryDataService();
 		this.logger.debug('Binary data service init complete');
+		await this.initDataDeduplicationService();
+		this.logger.debug('Data deduplication service init complete');
 		await this.initExternalHooks();
 		this.logger.debug('External hooks init complete');
 		await this.initExternalSecrets();
@@ -222,6 +226,17 @@ export class Start extends BaseCommand {
 		if (!this.globalConfig.endpoints.disableUi) {
 			await this.generateStaticAssets();
 		}
+
+		if (!this.globalConfig.taskRunners.disabled) {
+			Container.set(TaskManager, new SingleMainTaskManager());
+			const { TaskRunnerServer } = await import('@/runners/task-runner-server');
+			const taskRunnerServer = Container.get(TaskRunnerServer);
+			await taskRunnerServer.start();
+
+			const { TaskRunnerProcess } = await import('@/runners/task-runner-process');
+			const runnerProcess = Container.get(TaskRunnerProcess);
+			await runnerProcess.start();
+		}
 	}
 
 	async initOrchestration() {
@@ -241,10 +256,11 @@ export class Start extends BaseCommand {
 
 		await orchestrationService.init();
 
-		await Container.get(OrchestrationHandlerMainService).initWithOptions({
-			queueModeId: this.queueModeId,
-			publisher: Container.get(Publisher),
-		});
+		Container.get(PubSubHandler).init();
+
+		const subscriber = Container.get(Subscriber);
+		await subscriber.subscribe('n8n.commands');
+		await subscriber.subscribe('n8n.worker-response');
 
 		if (!orchestrationService.isMultiMainSetupEnabled) return;
 
@@ -374,10 +390,9 @@ export class Start extends BaseCommand {
 
 		if (executions.length === 0) return;
 
-		this.logger.debug(
-			'[Startup] Found enqueued executions to run',
-			executions.map((e) => e.id),
-		);
+		this.logger.debug('[Startup] Found enqueued executions to run', {
+			executionIds: executions.map((e) => e.id),
+		});
 
 		const ownershipService = Container.get(OwnershipService);
 		const workflowRunner = Container.get(WorkflowRunner);
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index e8a47e10e0..8c601c7ebc 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -4,7 +4,8 @@ import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
-import { OrchestrationHandlerWebhookService } from '@/services/orchestration/webhook/orchestration.handler.webhook.service';
+import { PubSubHandler } from '@/scaling/pubsub/pubsub-handler';
+import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import { OrchestrationWebhookService } from '@/services/orchestration/webhook/orchestration.webhook.service';
 import { WebhookServer } from '@/webhooks/webhook-server';
 
@@ -81,6 +82,8 @@ export class Webhook extends BaseCommand {
 		this.logger.debug('Orchestration init complete');
 		await this.initBinaryDataService();
 		this.logger.debug('Binary data service init complete');
+		await this.initDataDeduplicationService();
+		this.logger.debug('Data deduplication service init complete');
 		await this.initExternalHooks();
 		this.logger.debug('External hooks init complete');
 		await this.initExternalSecrets();
@@ -110,6 +113,8 @@ export class Webhook extends BaseCommand {
 
 	async initOrchestration() {
 		await Container.get(OrchestrationWebhookService).init();
-		await Container.get(OrchestrationHandlerWebhookService).init();
+
+		Container.get(PubSubHandler).init();
+		await Container.get(Subscriber).subscribe('n8n.commands');
 	}
 }
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index f5f6b2b79b..528951be4a 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -6,12 +6,12 @@ import config from '@/config';
 import { N8N_VERSION, inTest } from '@/constants';
 import { EventMessageGeneric } from '@/eventbus/event-message-classes/event-message-generic';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
-import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
+import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay';
 import { JobProcessor } from '@/scaling/job-processor';
-import { Publisher } from '@/scaling/pubsub/publisher.service';
+import { PubSubHandler } from '@/scaling/pubsub/pubsub-handler';
+import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import type { ScalingService } from '@/scaling/scaling.service';
 import type { WorkerServerEndpointsConfig } from '@/scaling/worker-server';
-import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
 import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
 
 import { BaseCommand } from './base-command';
@@ -93,6 +93,8 @@ export class Worker extends BaseCommand {
 		this.logger.debug('License init complete');
 		await this.initBinaryDataService();
 		this.logger.debug('Binary data service init complete');
+		await this.initDataDeduplicationService();
+		this.logger.debug('Data deduplication service init complete');
 		await this.initExternalHooks();
 		this.logger.debug('External hooks init complete');
 		await this.initExternalSecrets();
@@ -128,12 +130,9 @@ export class Worker extends BaseCommand {
 	 */
 	async initOrchestration() {
 		await Container.get(OrchestrationWorkerService).init();
-		await Container.get(OrchestrationHandlerWorkerService).initWithOptions({
-			queueModeId: this.queueModeId,
-			publisher: Container.get(Publisher),
-			getRunningJobIds: () => this.jobProcessor.getRunningJobIds(),
-			getRunningJobsSummary: () => this.jobProcessor.getRunningJobsSummary(),
-		});
+
+		Container.get(PubSubHandler).init();
+		await Container.get(Subscriber).subscribe('n8n.commands');
 	}
 
 	async setConcurrency() {
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 75239f5e59..6511ae4d03 100644
--- a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
+++ b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
@@ -11,13 +11,13 @@ import type { ExecutionRepository } from '@/databases/repositories/execution.rep
 import { InvalidConcurrencyLimitError } from '@/errors/invalid-concurrency-limit.error';
 import type { EventService } from '@/events/event.service';
 import type { IExecutingWorkflowData } from '@/interfaces';
-import type { Logger } from '@/logger';
 import type { Telemetry } from '@/telemetry';
+import { mockLogger } from '@test/mocking';
 
 import { ConcurrencyQueue } from '../concurrency-queue';
 
 describe('ConcurrencyControlService', () => {
-	const logger = mock<Logger>();
+	const logger = mockLogger();
 	const executionRepository = mock<ExecutionRepository>();
 	const telemetry = mock<Telemetry>();
 	const eventService = mock<EventService>();
diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts
index 45ef2e1206..cf537870f2 100644
--- a/packages/cli/src/concurrency/concurrency-control.service.ts
+++ b/packages/cli/src/concurrency/concurrency-control.service.ts
@@ -7,7 +7,7 @@ import { InvalidConcurrencyLimitError } from '@/errors/invalid-concurrency-limit
 import { UnknownExecutionModeError } from '@/errors/unknown-execution-mode.error';
 import { EventService } from '@/events/event.service';
 import type { IExecutingWorkflowData } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { Telemetry } from '@/telemetry';
 
 import { ConcurrencyQueue } from './concurrency-queue';
@@ -33,6 +33,8 @@ export class ConcurrencyControlService {
 		private readonly telemetry: Telemetry,
 		private readonly eventService: EventService,
 	) {
+		this.logger = this.logger.withScope('executions');
+
 		this.productionLimit = config.getEnv('executions.concurrency.productionLimit');
 
 		if (this.productionLimit === 0) {
@@ -45,7 +47,6 @@ export class ConcurrencyControlService {
 
 		if (this.productionLimit === -1 || config.getEnv('executions.mode') === 'queue') {
 			this.isEnabled = false;
-			this.log('Service disabled');
 			return;
 		}
 
@@ -64,13 +65,12 @@ export class ConcurrencyControlService {
 		});
 
 		this.productionQueue.on('execution-throttled', ({ executionId }) => {
-			this.log('Execution throttled', { executionId });
+			this.logger.debug('Execution throttled', { executionId });
 			this.eventService.emit('execution-throttled', { executionId });
 		});
 
 		this.productionQueue.on('execution-released', async (executionId) => {
-			this.log('Execution released', { executionId });
-			await this.executionRepository.resetStartedAt(executionId);
+			this.logger.debug('Execution released', { executionId });
 		});
 	}
 
@@ -144,9 +144,9 @@ export class ConcurrencyControlService {
 	// ----------------------------------
 
 	private logInit() {
-		this.log('Enabled');
+		this.logger.debug('Enabled');
 
-		this.log(
+		this.logger.debug(
 			[
 				'Production execution concurrency is',
 				this.productionLimit === -1 ? 'unlimited' : 'limited to ' + this.productionLimit.toString(),
@@ -171,10 +171,6 @@ export class ConcurrencyControlService {
 		throw new UnknownExecutionModeError(mode);
 	}
 
-	private log(message: string, meta?: object) {
-		this.logger.debug(['[Concurrency Control]', message].join(' '), meta);
-	}
-
 	private shouldReport(capacity: number) {
 		return config.getEnv('deployment.type') === 'cloud' && this.limitsToReport.includes(capacity);
 	}
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index e811fe8e10..047df9341e 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1,7 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
 import convict from 'convict';
 import { InstanceSettings } from 'n8n-core';
-import { LOG_LEVELS } from 'n8n-workflow';
 import path from 'path';
 import { Container } from 'typedi';
 
@@ -296,41 +295,6 @@ export const schema = {
 		env: 'EXTERNAL_HOOK_FILES',
 	},
 
-	logs: {
-		level: {
-			doc: 'Log output level',
-			format: LOG_LEVELS,
-			default: 'info',
-			env: 'N8N_LOG_LEVEL',
-		},
-		output: {
-			doc: 'Where to output logs. Options are: console, file. Multiple can be separated by comma (",")',
-			format: String,
-			default: 'console',
-			env: 'N8N_LOG_OUTPUT',
-		},
-		file: {
-			fileCountMax: {
-				doc: 'Maximum number of files to keep.',
-				format: Number,
-				default: 100,
-				env: 'N8N_LOG_FILE_COUNT_MAX',
-			},
-			fileSizeMax: {
-				doc: 'Maximum size for each log file in MB.',
-				format: Number,
-				default: 16,
-				env: 'N8N_LOG_FILE_SIZE_MAX',
-			},
-			location: {
-				doc: 'Log file location; only used if log output is set to file.',
-				format: String,
-				default: path.join(Container.get(InstanceSettings).n8nFolder, 'logs/n8n.log'),
-				env: 'N8N_LOG_FILE_LOCATION',
-			},
-		},
-	},
-
 	push: {
 		backend: {
 			format: ['sse', 'websocket'] as const,
diff --git a/packages/cli/src/config/types.ts b/packages/cli/src/config/types.ts
index 0d3c5db2cb..78f2358f5d 100644
--- a/packages/cli/src/config/types.ts
+++ b/packages/cli/src/config/types.ts
@@ -1,5 +1,6 @@
 import type { RedisOptions } from 'ioredis';
 import type { BinaryData } from 'n8n-core';
+import type { IProcessedDataConfig } from 'n8n-workflow';
 
 import type { schema } from './schema';
 
@@ -76,6 +77,7 @@ type ToReturnType<T extends ConfigOptionPath> = T extends NumericPath
 type ExceptionPaths = {
 	'queue.bull.redis': RedisOptions;
 	binaryDataManager: BinaryData.Config;
+	processedDataManager: IProcessedDataConfig;
 	'userManagement.isInstanceOwnerSetUp': boolean;
 	'ui.banners.dismissed': string[] | undefined;
 };
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 447b32e42f..04512e8be9 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -91,6 +91,7 @@ export const LICENSE_FEATURES = {
 	PROJECT_ROLE_EDITOR: 'feat:projectRole:editor',
 	PROJECT_ROLE_VIEWER: 'feat:projectRole:viewer',
 	AI_ASSISTANT: 'feat:aiAssistant',
+	ASK_AI: 'feat:askAi',
 	COMMUNITY_NODES_CUSTOM_REGISTRY: 'feat:communityNodes:customRegistry',
 } as const;
 
@@ -168,6 +169,8 @@ export const ARTIFICIAL_TASK_DATA = {
 	],
 };
 
+/** Lowest priority, meaning shut down happens after other groups */
 export const LOWEST_SHUTDOWN_PRIORITY = 0;
 export const DEFAULT_SHUTDOWN_PRIORITY = 100;
+/** Highest priority, meaning shut down happens before all other groups */
 export const HIGHEST_SHUTDOWN_PRIORITY = 200;
diff --git a/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts b/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts
new file mode 100644
index 0000000000..81025fb2ca
--- /dev/null
+++ b/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts
@@ -0,0 +1,79 @@
+import { mock } from 'jest-mock-extended';
+import { randomString } from 'n8n-workflow';
+import { Container } from 'typedi';
+
+import type { ApiKey } from '@/databases/entities/api-key';
+import type { User } from '@/databases/entities/user';
+import { ApiKeyRepository } from '@/databases/repositories/api-key.repository';
+import type { ApiKeysRequest, AuthenticatedRequest } from '@/requests';
+import { API_KEY_PREFIX } from '@/services/public-api-key.service';
+import { mockInstance } from '@test/mocking';
+
+import { ApiKeysController } from '../api-keys.controller';
+
+describe('ApiKeysController', () => {
+	const apiKeysRepository = mockInstance(ApiKeyRepository);
+	const controller = Container.get(ApiKeysController);
+
+	let req: AuthenticatedRequest;
+	beforeAll(() => {
+		req = mock<AuthenticatedRequest>({ user: mock<User>({ id: '123' }) });
+	});
+
+	describe('createAPIKey', () => {
+		it('should create and save an API key', async () => {
+			const apiKeyData = {
+				id: '123',
+				userId: '123',
+				label: 'My API Key',
+				apiKey: `${API_KEY_PREFIX}${randomString(42)}`,
+				createdAt: new Date(),
+			} as ApiKey;
+
+			apiKeysRepository.upsert.mockImplementation();
+
+			apiKeysRepository.findOneByOrFail.mockResolvedValue(apiKeyData);
+
+			const newApiKey = await controller.createAPIKey(req);
+
+			expect(apiKeysRepository.upsert).toHaveBeenCalled();
+			expect(apiKeyData).toEqual(newApiKey);
+		});
+	});
+
+	describe('getAPIKeys', () => {
+		it('should return the users api keys redacted', async () => {
+			const apiKeyData = {
+				id: '123',
+				userId: '123',
+				label: 'My API Key',
+				apiKey: `${API_KEY_PREFIX}${randomString(42)}`,
+				createdAt: new Date(),
+			} as ApiKey;
+
+			apiKeysRepository.findBy.mockResolvedValue([apiKeyData]);
+
+			const apiKeys = await controller.getAPIKeys(req);
+			expect(apiKeys[0].apiKey).not.toEqual(apiKeyData.apiKey);
+			expect(apiKeysRepository.findBy).toHaveBeenCalledWith({ userId: req.user.id });
+		});
+	});
+
+	describe('deleteAPIKey', () => {
+		it('should delete the API key', async () => {
+			const user = mock<User>({
+				id: '123',
+				password: 'password',
+				authIdentities: [],
+				role: 'global:member',
+				mfaEnabled: false,
+			});
+			const req = mock<ApiKeysRequest.DeleteAPIKey>({ user, params: { id: user.id } });
+			await controller.deleteAPIKey(req);
+			expect(apiKeysRepository.delete).toHaveBeenCalledWith({
+				userId: req.user.id,
+				id: req.params.id,
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index 3c9af48689..37c391a2dc 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -5,7 +5,7 @@ import jwt from 'jsonwebtoken';
 import { Container } from 'typedi';
 
 import { AUTH_COOKIE_NAME } from '@/constants';
-import { API_KEY_PREFIX, MeController } from '@/controllers/me.controller';
+import { MeController } from '@/controllers/me.controller';
 import type { User } from '@/databases/entities/user';
 import { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
 import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
@@ -408,32 +408,4 @@ describe('MeController', () => {
 			await expect(controller.storeSurveyAnswers(req)).rejects.toThrowError(BadRequestError);
 		});
 	});
-
-	describe('API Key methods', () => {
-		let req: AuthenticatedRequest;
-		beforeAll(() => {
-			req = mock({ user: mock<Partial<User>>({ id: '123', apiKey: `${API_KEY_PREFIX}test-key` }) });
-		});
-
-		describe('createAPIKey', () => {
-			it('should create and save an API key', async () => {
-				const { apiKey } = await controller.createAPIKey(req);
-				expect(userService.update).toHaveBeenCalledWith(req.user.id, { apiKey });
-			});
-		});
-
-		describe('getAPIKey', () => {
-			it('should return the users api key redacted', async () => {
-				const { apiKey } = await controller.getAPIKey(req);
-				expect(apiKey).not.toEqual(req.user.apiKey);
-			});
-		});
-
-		describe('deleteAPIKey', () => {
-			it('should delete the API key', async () => {
-				await controller.deleteAPIKey(req);
-				expect(userService.update).toHaveBeenCalledWith(req.user.id, { apiKey: null });
-			});
-		});
-	});
 });
diff --git a/packages/cli/src/controllers/ai-assistant.controller.ts b/packages/cli/src/controllers/ai.controller.ts
similarity index 65%
rename from packages/cli/src/controllers/ai-assistant.controller.ts
rename to packages/cli/src/controllers/ai.controller.ts
index c910be0a24..1957db2971 100644
--- a/packages/cli/src/controllers/ai-assistant.controller.ts
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -7,18 +7,18 @@ import { WritableStream } from 'node:stream/web';
 import { Post, RestController } from '@/decorators';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { AiAssistantRequest } from '@/requests';
-import { AiAssistantService } from '@/services/ai-assistant.service';
+import { AiService } from '@/services/ai.service';
 
 type FlushableResponse = Response & { flush: () => void };
 
-@RestController('/ai-assistant')
-export class AiAssistantController {
-	constructor(private readonly aiAssistantService: AiAssistantService) {}
+@RestController('/ai')
+export class AiController {
+	constructor(private readonly aiService: AiService) {}
 
 	@Post('/chat', { rateLimit: { limit: 100 } })
 	async chat(req: AiAssistantRequest.Chat, res: FlushableResponse) {
 		try {
-			const aiResponse = await this.aiAssistantService.chat(req.body, req.user);
+			const aiResponse = await this.aiService.chat(req.body, req.user);
 			if (aiResponse.body) {
 				res.header('Content-type', 'application/json-lines').flush();
 				await aiResponse.body.pipeTo(
@@ -40,10 +40,21 @@ export class AiAssistantController {
 
 	@Post('/chat/apply-suggestion')
 	async applySuggestion(
-		req: AiAssistantRequest.ApplySuggestion,
+		req: AiAssistantRequest.ApplySuggestionPayload,
 	): Promise<AiAssistantSDK.ApplySuggestionResponse> {
 		try {
-			return await this.aiAssistantService.applySuggestion(req.body, req.user);
+			return await this.aiService.applySuggestion(req.body, req.user);
+		} catch (e) {
+			assert(e instanceof Error);
+			ErrorReporterProxy.error(e);
+			throw new InternalServerError(`Something went wrong: ${e.message}`);
+		}
+	}
+
+	@Post('/ask-ai')
+	async askAi(req: AiAssistantRequest.AskAiPayload): Promise<AiAssistantSDK.AskAiResponsePayload> {
+		try {
+			return await this.aiService.askAi(req.body, req.user);
 		} catch (e) {
 			assert(e instanceof Error);
 			ErrorReporterProxy.error(e);
diff --git a/packages/cli/src/controllers/annotation-tags.controller.ts b/packages/cli/src/controllers/annotation-tags.controller.ee.ts
similarity index 99%
rename from packages/cli/src/controllers/annotation-tags.controller.ts
rename to packages/cli/src/controllers/annotation-tags.controller.ee.ts
index ff43c2ef7e..ed6ff8c52a 100644
--- a/packages/cli/src/controllers/annotation-tags.controller.ts
+++ b/packages/cli/src/controllers/annotation-tags.controller.ee.ts
@@ -1,6 +1,6 @@
 import { Delete, Get, Patch, Post, RestController, GlobalScope } from '@/decorators';
 import { AnnotationTagsRequest } from '@/requests';
-import { AnnotationTagService } from '@/services/annotation-tag.service';
+import { AnnotationTagService } from '@/services/annotation-tag.service.ee';
 
 @RestController('/annotation-tags')
 export class AnnotationTagsController {
diff --git a/packages/cli/src/controllers/api-keys.controller.ts b/packages/cli/src/controllers/api-keys.controller.ts
new file mode 100644
index 0000000000..db53a00449
--- /dev/null
+++ b/packages/cli/src/controllers/api-keys.controller.ts
@@ -0,0 +1,56 @@
+import { type RequestHandler } from 'express';
+
+import { Delete, Get, Post, RestController } from '@/decorators';
+import { EventService } from '@/events/event.service';
+import { isApiEnabled } from '@/public-api';
+import { ApiKeysRequest, AuthenticatedRequest } from '@/requests';
+import { PublicApiKeyService } from '@/services/public-api-key.service';
+
+export const isApiEnabledMiddleware: RequestHandler = (_, res, next) => {
+	if (isApiEnabled()) {
+		next();
+	} else {
+		res.status(404).end();
+	}
+};
+
+@RestController('/api-keys')
+export class ApiKeysController {
+	constructor(
+		private readonly eventService: EventService,
+		private readonly publicApiKeyService: PublicApiKeyService,
+	) {}
+
+	/**
+	 * Create an API Key
+	 */
+	@Post('/', { middlewares: [isApiEnabledMiddleware] })
+	async createAPIKey(req: AuthenticatedRequest) {
+		const newApiKey = await this.publicApiKeyService.createPublicApiKeyForUser(req.user);
+
+		this.eventService.emit('public-api-key-created', { user: req.user, publicApi: false });
+
+		return newApiKey;
+	}
+
+	/**
+	 * Get API keys
+	 */
+	@Get('/', { middlewares: [isApiEnabledMiddleware] })
+	async getAPIKeys(req: AuthenticatedRequest) {
+		const apiKeys = await this.publicApiKeyService.getRedactedApiKeysForUser(req.user);
+		return apiKeys;
+	}
+
+	/**
+	 * Delete an API Key
+	 */
+	@Delete('/:id', { middlewares: [isApiEnabledMiddleware] })
+	async deleteAPIKey(req: ApiKeysRequest.DeleteAPIKey) {
+		await this.publicApiKeyService.deleteApiKeyForUser(req.user, req.params.id);
+
+		this.eventService.emit('public-api-key-deleted', { user: req.user, publicApi: false });
+
+		return { success: true };
+	}
+}
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index 25f069ad20..c2ee1c92fb 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -14,7 +14,7 @@ import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { EventService } from '@/events/event.service';
 import type { PublicUser } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { MfaService } from '@/mfa/mfa.service';
 import { PostHogClient } from '@/posthog';
 import { AuthenticatedRequest, LoginRequest, UserRequest } from '@/requests';
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 5137d5b4af..9c5a1ff36d 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -14,7 +14,7 @@ import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'
 import type { BooleanLicenseFeature, NumericLicenseFeature } from '@/interfaces';
 import type { FeatureReturnType } from '@/license';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { MfaService } from '@/mfa/mfa.service';
 import { Push } from '@/push';
 import type { UserSetupPayload } from '@/requests';
@@ -92,6 +92,7 @@ export class E2EController {
 		[LICENSE_FEATURES.PROJECT_ROLE_VIEWER]: false,
 		[LICENSE_FEATURES.AI_ASSISTANT]: false,
 		[LICENSE_FEATURES.COMMUNITY_NODES_CUSTOM_REGISTRY]: false,
+		[LICENSE_FEATURES.ASK_AI]: false,
 	};
 
 	private numericFeatures: Record<NumericLicenseFeature, number> = {
diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts
index 411ab7a03f..cbd2afb9f4 100644
--- a/packages/cli/src/controllers/invitation.controller.ts
+++ b/packages/cli/src/controllers/invitation.controller.ts
@@ -12,7 +12,7 @@ import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { PostHogClient } from '@/posthog';
 import { UserRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 0e1bbb37a6..6cbbda3622 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -4,39 +4,26 @@ import {
 	UserUpdateRequestDto,
 } from '@n8n/api-types';
 import { plainToInstance } from 'class-transformer';
-import { randomBytes } from 'crypto';
-import { type RequestHandler, Response } from 'express';
+import { Response } from 'express';
 
 import { AuthService } from '@/auth/auth.service';
 import type { User } from '@/databases/entities/user';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { Body, Delete, Get, Patch, Post, RestController } from '@/decorators';
+import { Body, Patch, Post, RestController } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
 import type { PublicUser } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { MfaService } from '@/mfa/mfa.service';
-import { isApiEnabled } from '@/public-api';
 import { AuthenticatedRequest, MeRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
 import { UserService } from '@/services/user.service';
 import { isSamlLicensedAndEnabled } from '@/sso/saml/saml-helpers';
 
 import { PersonalizationSurveyAnswersV4 } from './survey-answers.dto';
-
-export const API_KEY_PREFIX = 'n8n_api_';
-
-export const isApiEnabledMiddleware: RequestHandler = (_, res, next) => {
-	if (isApiEnabled()) {
-		next();
-	} else {
-		res.status(404).end();
-	}
-};
-
 @RestController('/me')
 export class MeController {
 	constructor(
@@ -218,41 +205,6 @@ export class MeController {
 		return { success: true };
 	}
 
-	/**
-	 * Creates an API Key
-	 */
-	@Post('/api-key', { middlewares: [isApiEnabledMiddleware] })
-	async createAPIKey(req: AuthenticatedRequest) {
-		const apiKey = `n8n_api_${randomBytes(40).toString('hex')}`;
-
-		await this.userService.update(req.user.id, { apiKey });
-
-		this.eventService.emit('public-api-key-created', { user: req.user, publicApi: false });
-
-		return { apiKey };
-	}
-
-	/**
-	 * Get an API Key
-	 */
-	@Get('/api-key', { middlewares: [isApiEnabledMiddleware] })
-	async getAPIKey(req: AuthenticatedRequest) {
-		const apiKey = this.redactApiKey(req.user.apiKey);
-		return { apiKey };
-	}
-
-	/**
-	 * Deletes an API Key
-	 */
-	@Delete('/api-key', { middlewares: [isApiEnabledMiddleware] })
-	async deleteAPIKey(req: AuthenticatedRequest) {
-		await this.userService.update(req.user.id, { apiKey: null });
-
-		this.eventService.emit('public-api-key-deleted', { user: req.user, publicApi: false });
-
-		return { success: true };
-	}
-
 	/**
 	 * Update the logged-in user's settings.
 	 */
@@ -273,14 +225,4 @@ 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/controllers/oauth/__tests__/oauth1-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
index b2c0d13f21..68a86269d3 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
@@ -15,7 +15,7 @@ import { VariablesService } from '@/environments/variables/variables.service.ee'
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import type { OAuthRequest } from '@/requests';
 import { SecretsHelper } from '@/secrets-helpers';
 import { mockInstance } from '@test/mocking';
diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
index 139ab9a983..9fc98d5557 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
@@ -15,7 +15,7 @@ import { VariablesService } from '@/environments/variables/variables.service.ee'
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import type { OAuthRequest } from '@/requests';
 import { SecretsHelper } from '@/secrets-helpers';
 import { mockInstance } from '@test/mocking';
diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
index 6750c7c2a3..6e162af988 100644
--- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
+++ b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
@@ -15,7 +15,7 @@ import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
 import type { ICredentialsDb } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import type { OAuthRequest } from '@/requests';
 import { UrlService } from '@/services/url.service';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
diff --git a/packages/cli/src/controllers/orchestration.controller.ts b/packages/cli/src/controllers/orchestration.controller.ts
index a5235d1169..db1d690a3e 100644
--- a/packages/cli/src/controllers/orchestration.controller.ts
+++ b/packages/cli/src/controllers/orchestration.controller.ts
@@ -28,11 +28,4 @@ export class OrchestrationController {
 		if (!this.licenseService.isWorkerViewLicensed()) return;
 		return await this.orchestrationService.getWorkerStatus();
 	}
-
-	@GlobalScope('orchestration:list')
-	@Post('/worker/ids')
-	async getWorkerIdsAll() {
-		if (!this.licenseService.isWorkerViewLicensed()) return;
-		return await this.orchestrationService.getWorkerIds();
-	}
 }
diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts
index 76a0191359..47d50ad3f0 100644
--- a/packages/cli/src/controllers/owner.controller.ts
+++ b/packages/cli/src/controllers/owner.controller.ts
@@ -9,7 +9,7 @@ import { GlobalScope, Post, RestController } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
 import { validateEntity } from '@/generic-helpers';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { PostHogClient } from '@/posthog';
 import { OwnerRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
diff --git a/packages/cli/src/controllers/password-reset.controller.ts b/packages/cli/src/controllers/password-reset.controller.ts
index ed566cf129..88155e420a 100644
--- a/packages/cli/src/controllers/password-reset.controller.ts
+++ b/packages/cli/src/controllers/password-reset.controller.ts
@@ -13,7 +13,7 @@ import { UnprocessableRequestError } from '@/errors/response-errors/unprocessabl
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { MfaService } from '@/mfa/mfa.service';
 import { PasswordResetRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index c00fe48ad8..8e19be894d 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -18,7 +18,7 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import type { PublicUser } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { listQueryMiddleware } from '@/middlewares';
 import { AuthenticatedRequest, ListQuery, UserRequest } from '@/requests';
 import { ProjectService } from '@/services/project.service';
diff --git a/packages/cli/src/controllers/workflow-statistics.controller.ts b/packages/cli/src/controllers/workflow-statistics.controller.ts
index 1268643b14..58c99727db 100644
--- a/packages/cli/src/controllers/workflow-statistics.controller.ts
+++ b/packages/cli/src/controllers/workflow-statistics.controller.ts
@@ -7,7 +7,7 @@ import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-
 import { Get, Middleware, RestController } from '@/decorators';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import type { IWorkflowStatisticsDataLoaded } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import { StatisticsRequest } from './workflow-statistics.types';
 
diff --git a/packages/cli/src/crash-journal.ts b/packages/cli/src/crash-journal.ts
index 184702c446..577a2f34fe 100644
--- a/packages/cli/src/crash-journal.ts
+++ b/packages/cli/src/crash-journal.ts
@@ -6,7 +6,7 @@ import { join, dirname } from 'path';
 import { Container } from 'typedi';
 
 import { inProduction } from '@/constants';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 export const touchFile = async (filePath: string): Promise<void> => {
 	await mkdir(dirname(filePath), { recursive: true });
diff --git a/packages/cli/src/credentials-overwrites.ts b/packages/cli/src/credentials-overwrites.ts
index ec14bf7ecc..ed1b492dc6 100644
--- a/packages/cli/src/credentials-overwrites.ts
+++ b/packages/cli/src/credentials-overwrites.ts
@@ -5,7 +5,7 @@ import { Service } from 'typedi';
 
 import { CredentialTypes } from '@/credential-types';
 import type { ICredentialsOverwrite } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 @Service()
 export class CredentialsOverwrites {
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 41d9d163ba..76db501cf7 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -23,7 +23,7 @@ import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { listQueryMiddleware } from '@/middlewares';
 import { CredentialRequest } from '@/requests';
 import { NamingService } from '@/services/naming.service';
diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts
index 116137374a..aad78fe7b7 100644
--- a/packages/cli/src/credentials/credentials.service.ee.ts
+++ b/packages/cli/src/credentials/credentials.service.ee.ts
@@ -157,14 +157,6 @@ export class EnterpriseCredentialsService {
 				"You can't transfer a credential into the project that's already owning it.",
 			);
 		}
-		if (sourceProject.type !== 'team' && sourceProject.type !== 'personal') {
-			throw new TransferCredentialError(
-				'You can only transfer credentials out of personal or team projects.',
-			);
-		}
-		if (destinationProject.type !== 'team') {
-			throw new TransferCredentialError('You can only transfer credentials into team projects.');
-		}
 
 		await this.sharedCredentialsRepository.manager.transaction(async (trx) => {
 			// 6. transfer the credential
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index dc5ab4e6c7..f9bbf89e57 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -33,7 +33,7 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
 import type { ICredentialsDb } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { userHasScopes } from '@/permissions/check-access';
 import type { CredentialRequest, ListQuery } from '@/requests';
 import { CredentialsTester } from '@/services/credentials-tester.service';
diff --git a/packages/cli/src/databases/entities/__tests__/user.entity.test.ts b/packages/cli/src/databases/entities/__tests__/user.entity.test.ts
index 5901d0218b..5bd8b0f2cb 100644
--- a/packages/cli/src/databases/entities/__tests__/user.entity.test.ts
+++ b/packages/cli/src/databases/entities/__tests__/user.entity.test.ts
@@ -8,7 +8,6 @@ describe('User Entity', () => {
 				firstName: 'Don',
 				lastName: 'Joe',
 				password: '123456789',
-				apiKey: '123',
 			});
 			expect(JSON.stringify(user)).toEqual(
 				'{"email":"test@example.com","firstName":"Don","lastName":"Joe"}',
diff --git a/packages/cli/src/databases/entities/annotation-tag-entity.ts b/packages/cli/src/databases/entities/annotation-tag-entity.ee.ts
similarity index 93%
rename from packages/cli/src/databases/entities/annotation-tag-entity.ts
rename to packages/cli/src/databases/entities/annotation-tag-entity.ee.ts
index e89c75a5a8..4aed8df8af 100644
--- a/packages/cli/src/databases/entities/annotation-tag-entity.ts
+++ b/packages/cli/src/databases/entities/annotation-tag-entity.ee.ts
@@ -1,8 +1,8 @@
 import { Column, Entity, Index, ManyToMany, OneToMany } from '@n8n/typeorm';
 import { IsString, Length } from 'class-validator';
 
-import type { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping';
-import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation';
+import type { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
+import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
 
 import { WithTimestampsAndStringId } from './abstract-entity';
 
diff --git a/packages/cli/src/databases/entities/annotation-tag-mapping.ts b/packages/cli/src/databases/entities/annotation-tag-mapping.ee.ts
similarity index 98%
rename from packages/cli/src/databases/entities/annotation-tag-mapping.ts
rename to packages/cli/src/databases/entities/annotation-tag-mapping.ee.ts
index 2fa4fc79c1..5b1b9e1bf2 100644
--- a/packages/cli/src/databases/entities/annotation-tag-mapping.ts
+++ b/packages/cli/src/databases/entities/annotation-tag-mapping.ee.ts
@@ -1,7 +1,7 @@
 import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
 
-import type { AnnotationTagEntity } from './annotation-tag-entity';
-import type { ExecutionAnnotation } from './execution-annotation';
+import type { AnnotationTagEntity } from './annotation-tag-entity.ee';
+import type { ExecutionAnnotation } from './execution-annotation.ee';
 
 /**
  * This entity represents the junction table between the execution annotations and the tags
diff --git a/packages/cli/src/databases/entities/api-key.ts b/packages/cli/src/databases/entities/api-key.ts
new file mode 100644
index 0000000000..6e2df2d00c
--- /dev/null
+++ b/packages/cli/src/databases/entities/api-key.ts
@@ -0,0 +1,25 @@
+import { Column, Entity, Index, ManyToOne, Unique } from '@n8n/typeorm';
+
+import { WithTimestampsAndStringId } from './abstract-entity';
+import { User } from './user';
+
+@Entity('user_api_keys')
+@Unique(['userId', 'label'])
+export class ApiKey extends WithTimestampsAndStringId {
+	@ManyToOne(
+		() => User,
+		(user) => user.id,
+		{ onDelete: 'CASCADE' },
+	)
+	user: User;
+
+	@Column({ type: String })
+	userId: string;
+
+	@Column({ type: String })
+	label: string;
+
+	@Index({ unique: true })
+	@Column({ type: String })
+	apiKey: string;
+}
diff --git a/packages/cli/src/databases/entities/execution-annotation.ts b/packages/cli/src/databases/entities/execution-annotation.ee.ts
similarity index 98%
rename from packages/cli/src/databases/entities/execution-annotation.ts
rename to packages/cli/src/databases/entities/execution-annotation.ee.ts
index 33943f6330..59820c83b5 100644
--- a/packages/cli/src/databases/entities/execution-annotation.ts
+++ b/packages/cli/src/databases/entities/execution-annotation.ee.ts
@@ -12,8 +12,8 @@ import {
 } from '@n8n/typeorm';
 import type { AnnotationVote } from 'n8n-workflow';
 
-import type { AnnotationTagEntity } from './annotation-tag-entity';
-import type { AnnotationTagMapping } from './annotation-tag-mapping';
+import type { AnnotationTagEntity } from './annotation-tag-entity.ee';
+import type { AnnotationTagMapping } from './annotation-tag-mapping.ee';
 import { ExecutionEntity } from './execution-entity';
 
 @Entity({ name: 'execution_annotations' })
diff --git a/packages/cli/src/databases/entities/execution-entity.ts b/packages/cli/src/databases/entities/execution-entity.ts
index d44cb6c3f0..7b63b63eaf 100644
--- a/packages/cli/src/databases/entities/execution-entity.ts
+++ b/packages/cli/src/databases/entities/execution-entity.ts
@@ -12,7 +12,7 @@ import {
 } from '@n8n/typeorm';
 import { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
 
-import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation';
+import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
 
 import { datetimeColumnType } from './abstract-entity';
 import type { ExecutionData } from './execution-data';
@@ -47,7 +47,14 @@ export class ExecutionEntity {
 	status: ExecutionStatus;
 
 	@Column(datetimeColumnType)
-	startedAt: Date;
+	createdAt: Date;
+
+	/**
+	 * Time when the processing of the execution actually started. This column
+	 * is `null` when an execution is enqueued but has not started yet.
+	 */
+	@Column({ type: datetimeColumnType, nullable: true })
+	startedAt: Date | null;
 
 	@Index()
 	@Column({ type: datetimeColumnType, nullable: true })
diff --git a/packages/cli/src/databases/entities/index.ts b/packages/cli/src/databases/entities/index.ts
index 8ae29ababd..39f67b3252 100644
--- a/packages/cli/src/databases/entities/index.ts
+++ b/packages/cli/src/databases/entities/index.ts
@@ -1,17 +1,19 @@
-import { AnnotationTagEntity } from './annotation-tag-entity';
-import { AnnotationTagMapping } from './annotation-tag-mapping';
+import { AnnotationTagEntity } from './annotation-tag-entity.ee';
+import { AnnotationTagMapping } from './annotation-tag-mapping.ee';
+import { ApiKey } from './api-key';
 import { AuthIdentity } from './auth-identity';
 import { AuthProviderSyncHistory } from './auth-provider-sync-history';
 import { AuthUser } from './auth-user';
 import { CredentialsEntity } from './credentials-entity';
 import { EventDestinations } from './event-destinations';
-import { ExecutionAnnotation } from './execution-annotation';
+import { ExecutionAnnotation } from './execution-annotation.ee';
 import { ExecutionData } from './execution-data';
 import { ExecutionEntity } from './execution-entity';
 import { ExecutionMetadata } from './execution-metadata';
 import { InstalledNodes } from './installed-nodes';
 import { InstalledPackages } from './installed-packages';
 import { InvalidAuthToken } from './invalid-auth-token';
+import { ProcessedData } from './processed-data';
 import { Project } from './project';
 import { ProjectRelation } from './project-relation';
 import { Settings } from './settings';
@@ -54,4 +56,6 @@ export const entities = {
 	WorkflowHistory,
 	Project,
 	ProjectRelation,
+	ApiKey,
+	ProcessedData,
 };
diff --git a/packages/cli/src/databases/entities/processed-data.ts b/packages/cli/src/databases/entities/processed-data.ts
new file mode 100644
index 0000000000..bd638fca95
--- /dev/null
+++ b/packages/cli/src/databases/entities/processed-data.ts
@@ -0,0 +1,22 @@
+import { Column, Entity, PrimaryColumn } from '@n8n/typeorm';
+
+import type { IProcessedDataEntries, IProcessedDataLatest } from '@/interfaces';
+
+import { jsonColumnType, WithTimestamps } from './abstract-entity';
+import { objectRetriever } from '../utils/transformers';
+
+@Entity()
+export class ProcessedData extends WithTimestamps {
+	@PrimaryColumn('varchar')
+	context: string;
+
+	@PrimaryColumn()
+	workflowId: string;
+
+	@Column({
+		type: jsonColumnType,
+		nullable: true,
+		transformer: objectRetriever,
+	})
+	value: IProcessedDataEntries | IProcessedDataLatest;
+}
diff --git a/packages/cli/src/databases/entities/user.ts b/packages/cli/src/databases/entities/user.ts
index 32b257fcd1..b75bec757c 100644
--- a/packages/cli/src/databases/entities/user.ts
+++ b/packages/cli/src/databases/entities/user.ts
@@ -23,6 +23,7 @@ import { NoUrl } from '@/validators/no-url.validator';
 import { NoXss } from '@/validators/no-xss.validator';
 
 import { WithTimestamps, jsonColumnType } from './abstract-entity';
+import type { ApiKey } from './api-key';
 import type { AuthIdentity } from './auth-identity';
 import type { ProjectRelation } from './project-relation';
 import type { SharedCredentials } from './shared-credentials';
@@ -89,6 +90,9 @@ export class User extends WithTimestamps implements IUser {
 	@OneToMany('AuthIdentity', 'user')
 	authIdentities: AuthIdentity[];
 
+	@OneToMany('ApiKey', 'user')
+	apiKeys: ApiKey[];
+
 	@OneToMany('SharedWorkflow', 'user')
 	sharedWorkflows: SharedWorkflow[];
 
@@ -107,10 +111,6 @@ export class User extends WithTimestamps implements IUser {
 		this.email = this.email?.toLowerCase() ?? null;
 	}
 
-	@Column({ type: String, nullable: true })
-	@Index({ unique: true })
-	apiKey: string | null;
-
 	@Column({ type: Boolean, default: false })
 	mfaEnabled: boolean;
 
@@ -151,7 +151,7 @@ export class User extends WithTimestamps implements IUser {
 	}
 
 	toJSON() {
-		const { password, apiKey, ...rest } = this;
+		const { password, ...rest } = this;
 		return rest;
 	}
 
diff --git a/packages/cli/src/databases/migrations/common/1724951148974-AddApiKeysTable.ts b/packages/cli/src/databases/migrations/common/1724951148974-AddApiKeysTable.ts
new file mode 100644
index 0000000000..a9ea5626bb
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1724951148974-AddApiKeysTable.ts
@@ -0,0 +1,109 @@
+import type { ApiKey } from '@/databases/entities/api-key';
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+import { generateNanoId } from '@/databases/utils/generators';
+
+export class AddApiKeysTable1724951148974 implements ReversibleMigration {
+	async up({
+		queryRunner,
+		escape,
+		runQuery,
+		schemaBuilder: { createTable, column },
+	}: MigrationContext) {
+		const userTable = escape.tableName('user');
+		const userApiKeysTable = escape.tableName('user_api_keys');
+		const userIdColumn = escape.columnName('userId');
+		const apiKeyColumn = escape.columnName('apiKey');
+		const labelColumn = escape.columnName('label');
+		const idColumn = escape.columnName('id');
+
+		// Create the new table
+		await createTable('user_api_keys')
+			.withColumns(
+				column('id').varchar(36).primary,
+				column('userId').uuid.notNull,
+				column('label').varchar(100).notNull,
+				column('apiKey').varchar().notNull,
+			)
+			.withForeignKey('userId', {
+				tableName: 'user',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			})
+			.withIndexOn(['userId', 'label'], true)
+			.withIndexOn(['apiKey'], true).withTimestamps;
+
+		const usersWithApiKeys = (await queryRunner.query(
+			`SELECT ${idColumn}, ${apiKeyColumn} FROM ${userTable} WHERE ${apiKeyColumn} IS NOT NULL`,
+		)) as Array<Partial<ApiKey>>;
+
+		// Move the apiKey from the users table to the new table
+		await Promise.all(
+			usersWithApiKeys.map(
+				async (user: { id: string; apiKey: string }) =>
+					await runQuery(
+						`INSERT INTO ${userApiKeysTable} (${idColumn}, ${userIdColumn}, ${apiKeyColumn}, ${labelColumn}) VALUES (:id, :userId, :apiKey, :label)`,
+						{
+							id: generateNanoId(),
+							userId: user.id,
+							apiKey: user.apiKey,
+							label: 'My API Key',
+						},
+					),
+			),
+		);
+
+		//  Drop apiKey column on user's table
+		await queryRunner.query(`ALTER TABLE ${userTable} DROP COLUMN ${apiKeyColumn};`);
+	}
+
+	async down({
+		queryRunner,
+		runQuery,
+		schemaBuilder: { dropTable, addColumns, createIndex, column },
+		escape,
+		isMysql,
+	}: MigrationContext) {
+		const userTable = escape.tableName('user');
+		const userApiKeysTable = escape.tableName('user_api_keys');
+		const apiKeyColumn = escape.columnName('apiKey');
+		const userIdColumn = escape.columnName('userId');
+		const idColumn = escape.columnName('id');
+		const createdAtColumn = escape.columnName('createdAt');
+
+		await addColumns('user', [column('apiKey').varchar()]);
+
+		await createIndex('user', ['apiKey'], true);
+
+		const queryToGetUsersApiKeys = isMysql
+			? `
+			SELECT ${userIdColumn},
+				${apiKeyColumn},
+				${createdAtColumn}
+			FROM ${userApiKeysTable} u
+			WHERE ${createdAtColumn} = (SELECT Min(${createdAtColumn})
+																	FROM   ${userApiKeysTable}
+																	WHERE  ${userIdColumn} = u.${userIdColumn});`
+			: `
+				SELECT DISTINCT ON
+					(${userIdColumn}) ${userIdColumn},
+					${apiKeyColumn}, ${createdAtColumn}
+				FROM ${userApiKeysTable}
+				ORDER BY ${userIdColumn}, ${createdAtColumn} ASC;`;
+
+		const oldestApiKeysPerUser = (await queryRunner.query(queryToGetUsersApiKeys)) as Array<
+			Partial<ApiKey>
+		>;
+
+		await Promise.all(
+			oldestApiKeysPerUser.map(
+				async (user: { userId: string; apiKey: string }) =>
+					await runQuery(
+						`UPDATE ${userTable} SET ${apiKeyColumn} = :apiKey WHERE ${idColumn} = :userId`,
+						user,
+					),
+			),
+		);
+
+		await dropTable('user_api_keys');
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1726606152711-CreateProcessedDataTable.ts b/packages/cli/src/databases/migrations/common/1726606152711-CreateProcessedDataTable.ts
new file mode 100644
index 0000000000..86992a0580
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1726606152711-CreateProcessedDataTable.ts
@@ -0,0 +1,23 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+const processedDataTableName = 'processed_data';
+
+export class CreateProcessedDataTable1726606152711 implements ReversibleMigration {
+	async up({ schemaBuilder: { createTable, column } }: MigrationContext) {
+		await createTable(processedDataTableName)
+			.withColumns(
+				column('workflowId').varchar(36).notNull.primary,
+				column('value').varchar(255).notNull,
+				column('context').varchar(255).notNull.primary,
+			)
+			.withForeignKey('workflowId', {
+				tableName: 'workflow_entity',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			}).withTimestamps;
+	}
+
+	async down({ schemaBuilder: { dropTable } }: MigrationContext) {
+		await dropTable(processedDataTableName);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts b/packages/cli/src/databases/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts
new file mode 100644
index 0000000000..a44450fa2f
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1727427440136-SeparateExecutionCreationFromStart.ts
@@ -0,0 +1,27 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+export class SeparateExecutionCreationFromStart1727427440136 implements ReversibleMigration {
+	async up({
+		schemaBuilder: { addColumns, column, dropNotNull },
+		runQuery,
+		escape,
+	}: MigrationContext) {
+		await addColumns('execution_entity', [
+			column('createdAt').notNull.timestamp().default('NOW()'),
+		]);
+
+		await dropNotNull('execution_entity', 'startedAt');
+
+		const executionEntity = escape.tableName('execution_entity');
+		const createdAt = escape.columnName('createdAt');
+		const startedAt = escape.columnName('startedAt');
+
+		// inaccurate for pre-migration rows but prevents `createdAt` from being nullable
+		await runQuery(`UPDATE ${executionEntity} SET ${createdAt} = ${startedAt};`);
+	}
+
+	async down({ schemaBuilder: { dropColumns, addNotNull } }: MigrationContext) {
+		await dropColumns('execution_entity', ['createdAt']);
+		await addNotNull('execution_entity', 'startedAt');
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index f3660f905d..1dcca1e592 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -63,6 +63,9 @@ import { AddConstraintToExecutionMetadata1720101653148 } from '../common/1720101
 import { CreateInvalidAuthTokenTable1723627610222 } from '../common/1723627610222-CreateInvalidAuthTokenTable';
 import { RefactorExecutionIndices1723796243146 } from '../common/1723796243146-RefactorExecutionIndices';
 import { CreateAnnotationTables1724753530828 } from '../common/1724753530828-CreateExecutionAnnotationTables';
+import { AddApiKeysTable1724951148974 } from '../common/1724951148974-AddApiKeysTable';
+import { CreateProcessedDataTable1726606152711 } from '../common/1726606152711-CreateProcessedDataTable';
+import { SeparateExecutionCreationFromStart1727427440136 } from '../common/1727427440136-SeparateExecutionCreationFromStart';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -128,4 +131,7 @@ export const mysqlMigrations: Migration[] = [
 	CreateInvalidAuthTokenTable1723627610222,
 	RefactorExecutionIndices1723796243146,
 	CreateAnnotationTables1724753530828,
+	AddApiKeysTable1724951148974,
+	SeparateExecutionCreationFromStart1727427440136,
+	CreateProcessedDataTable1726606152711,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index e3ad5afa57..eb0e2bd946 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -63,6 +63,9 @@ import { AddConstraintToExecutionMetadata1720101653148 } from '../common/1720101
 import { CreateInvalidAuthTokenTable1723627610222 } from '../common/1723627610222-CreateInvalidAuthTokenTable';
 import { RefactorExecutionIndices1723796243146 } from '../common/1723796243146-RefactorExecutionIndices';
 import { CreateAnnotationTables1724753530828 } from '../common/1724753530828-CreateExecutionAnnotationTables';
+import { AddApiKeysTable1724951148974 } from '../common/1724951148974-AddApiKeysTable';
+import { CreateProcessedDataTable1726606152711 } from '../common/1726606152711-CreateProcessedDataTable';
+import { SeparateExecutionCreationFromStart1727427440136 } from '../common/1727427440136-SeparateExecutionCreationFromStart';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -128,4 +131,7 @@ export const postgresMigrations: Migration[] = [
 	CreateInvalidAuthTokenTable1723627610222,
 	RefactorExecutionIndices1723796243146,
 	CreateAnnotationTables1724753530828,
+	AddApiKeysTable1724951148974,
+	SeparateExecutionCreationFromStart1727427440136,
+	CreateProcessedDataTable1726606152711,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1724951148974-AddApiKeysTable.ts b/packages/cli/src/databases/migrations/sqlite/1724951148974-AddApiKeysTable.ts
new file mode 100644
index 0000000000..71dcecdfb3
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1724951148974-AddApiKeysTable.ts
@@ -0,0 +1,127 @@
+import type { ApiKey } from '@/databases/entities/api-key';
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+import { generateNanoId } from '@/databases/utils/generators';
+
+export class AddApiKeysTable1724951148974 implements ReversibleMigration {
+	transaction = false as const;
+
+	async up({ queryRunner, tablePrefix, runQuery }: MigrationContext) {
+		const tableName = `${tablePrefix}user_api_keys`;
+
+		// Create the table
+		await queryRunner.query(`
+			CREATE TABLE ${tableName} (
+				id VARCHAR(36) PRIMARY KEY NOT NULL,
+				"userId" VARCHAR NOT NULL,
+				"label" VARCHAR(100) NOT NULL,
+				"apiKey" VARCHAR NOT NULL,
+				"createdAt" DATETIME(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),
+				"updatedAt" DATETIME(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),
+				FOREIGN KEY ("userId") REFERENCES user(id) ON DELETE CASCADE,
+				UNIQUE ("userId", label),
+				UNIQUE("apiKey")
+			);
+		`);
+
+		const usersWithApiKeys = (await queryRunner.query(
+			`SELECT id, "apiKey" FROM ${tablePrefix}user WHERE "apiKey" IS NOT NULL`,
+		)) as Array<Partial<ApiKey>>;
+
+		// Move the apiKey from the users table to the new table
+		await Promise.all(
+			usersWithApiKeys.map(
+				async (user: { id: string; apiKey: string }) =>
+					await runQuery(
+						`INSERT INTO ${tableName} ("id", "userId", "apiKey", "label") VALUES (:id, :userId, :apiKey, :label)`,
+						{
+							id: generateNanoId(),
+							userId: user.id,
+							apiKey: user.apiKey,
+							label: 'My API Key',
+						},
+					),
+			),
+		);
+
+		// Create temporary table to store the users dropping the api key column
+		await queryRunner.query(`
+				CREATE TABLE users_new (
+					id varchar PRIMARY KEY,
+					email VARCHAR(255) UNIQUE,
+					"firstName" VARCHAR(32),
+					"lastName" VARCHAR(32),
+					password VARCHAR,
+					"personalizationAnswers" TEXT,
+					"createdAt" DATETIME(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),
+					"updatedAt" DATETIME(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),
+					settings TEXT,
+					disabled BOOLEAN DEFAULT FALSE NOT NULL,
+					"mfaEnabled" BOOLEAN DEFAULT FALSE NOT NULL,
+					"mfaSecret" TEXT,
+					"mfaRecoveryCodes" TEXT,
+					role TEXT NOT NULL
+			);
+		`);
+
+		//  Copy the data from the original users table
+		await queryRunner.query(`
+			INSERT INTO users_new ("id", "email", "firstName", "lastName", "password", "personalizationAnswers", "createdAt", "updatedAt", "settings", "disabled", "mfaEnabled", "mfaSecret", "mfaRecoveryCodes", "role")
+			SELECT "id", "email", "firstName", "lastName", "password", "personalizationAnswers", "createdAt", "updatedAt", "settings", "disabled", "mfaEnabled", "mfaSecret", "mfaRecoveryCodes", "role"
+			FROM ${tablePrefix}user;
+		`);
+
+		// Drop table with apiKey column
+		await queryRunner.query(`DROP TABLE ${tablePrefix}user;`);
+
+		// Rename the temporary table to users
+		await queryRunner.query('ALTER TABLE users_new RENAME TO user;');
+	}
+
+	async down({
+		queryRunner,
+		runQuery,
+		tablePrefix,
+		schemaBuilder: { dropTable, createIndex },
+		escape,
+	}: MigrationContext) {
+		const userApiKeysTable = escape.tableName('user_api_keys');
+		const apiKeyColumn = escape.columnName('apiKey');
+		const userIdColumn = escape.columnName('userId');
+		const idColumn = escape.columnName('id');
+		const createdAtColumn = escape.columnName('createdAt');
+
+		const queryToGetUsersApiKeys = `
+		SELECT
+			${userIdColumn},
+			${apiKeyColumn},
+			${createdAtColumn}
+	FROM
+		${userApiKeysTable}
+	WHERE
+		${createdAtColumn} IN(
+			SELECT
+				MIN(${createdAtColumn})
+				FROM ${userApiKeysTable}
+			GROUP BY ${userIdColumn});`;
+
+		const oldestApiKeysPerUser = (await queryRunner.query(queryToGetUsersApiKeys)) as Array<
+			Partial<ApiKey>
+		>;
+
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}user ADD COLUMN "apiKey" varchar;`);
+
+		await createIndex('user', ['apiKey'], true);
+
+		await Promise.all(
+			oldestApiKeysPerUser.map(
+				async (user: { userId: string; apiKey: string }) =>
+					await runQuery(
+						`UPDATE ${tablePrefix}user SET ${apiKeyColumn} = :apiKey WHERE ${idColumn} = :userId`,
+						user,
+					),
+			),
+		);
+
+		await dropTable('user_api_keys');
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index a1739ae4a4..797b26752c 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -37,6 +37,7 @@ import { AddMfaColumns1690000000030 } from './1690000000040-AddMfaColumns';
 import { ExecutionSoftDelete1693491613982 } from './1693491613982-ExecutionSoftDelete';
 import { DropRoleMapping1705429061930 } from './1705429061930-DropRoleMapping';
 import { AddActivatedAtUserSetting1717498465931 } from './1717498465931-AddActivatedAtUserSetting';
+import { AddApiKeysTable1724951148974 } from './1724951148974-AddApiKeysTable';
 import { UniqueWorkflowNames1620821879465 } from '../common/1620821879465-UniqueWorkflowNames';
 import { UpdateWorkflowCredentials1630330987096 } from '../common/1630330987096-UpdateWorkflowCredentials';
 import { AddNodeIds1658930531669 } from '../common/1658930531669-AddNodeIds';
@@ -60,6 +61,8 @@ import { AddConstraintToExecutionMetadata1720101653148 } from '../common/1720101
 import { CreateInvalidAuthTokenTable1723627610222 } from '../common/1723627610222-CreateInvalidAuthTokenTable';
 import { RefactorExecutionIndices1723796243146 } from '../common/1723796243146-RefactorExecutionIndices';
 import { CreateAnnotationTables1724753530828 } from '../common/1724753530828-CreateExecutionAnnotationTables';
+import { CreateProcessedDataTable1726606152711 } from '../common/1726606152711-CreateProcessedDataTable';
+import { SeparateExecutionCreationFromStart1727427440136 } from '../common/1727427440136-SeparateExecutionCreationFromStart';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -122,6 +125,9 @@ const sqliteMigrations: Migration[] = [
 	CreateInvalidAuthTokenTable1723627610222,
 	RefactorExecutionIndices1723796243146,
 	CreateAnnotationTables1724753530828,
+	AddApiKeysTable1724951148974,
+	SeparateExecutionCreationFromStart1727427440136,
+	CreateProcessedDataTable1726606152711,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
index ac45b71bc4..10d1371f37 100644
--- a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
@@ -12,7 +12,9 @@ import { mockInstance, mockEntityManager } from '@test/mocking';
 
 describe('ExecutionRepository', () => {
 	const entityManager = mockEntityManager(ExecutionEntity);
-	const globalConfig = mockInstance(GlobalConfig);
+	const globalConfig = mockInstance(GlobalConfig, {
+		logging: { outputs: ['console'], scopes: [] },
+	});
 	const binaryDataService = mockInstance(BinaryDataService);
 	const executionRepository = Container.get(ExecutionRepository);
 	const mockDate = new Date('2023-12-28 12:34:56.789Z');
diff --git a/packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ts b/packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts
similarity index 97%
rename from packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ts
rename to packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts
index c8c4a80d31..07bb79815b 100644
--- a/packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ts
+++ b/packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts
@@ -1,7 +1,7 @@
 import { DataSource, Repository } from '@n8n/typeorm';
 import { Service } from 'typedi';
 
-import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping';
+import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
 
 @Service()
 export class AnnotationTagMappingRepository extends Repository<AnnotationTagMapping> {
diff --git a/packages/cli/src/databases/repositories/annotation-tag.repository.ts b/packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts
similarity index 94%
rename from packages/cli/src/databases/repositories/annotation-tag.repository.ts
rename to packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts
index 2f4b847ba6..e3aa993460 100644
--- a/packages/cli/src/databases/repositories/annotation-tag.repository.ts
+++ b/packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts
@@ -1,7 +1,7 @@
 import { DataSource, Repository } from '@n8n/typeorm';
 import { Service } from 'typedi';
 
-import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
+import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
 
 @Service()
 export class AnnotationTagRepository extends Repository<AnnotationTagEntity> {
diff --git a/packages/cli/src/databases/repositories/api-key.repository.ts b/packages/cli/src/databases/repositories/api-key.repository.ts
new file mode 100644
index 0000000000..21ad2c3e40
--- /dev/null
+++ b/packages/cli/src/databases/repositories/api-key.repository.ts
@@ -0,0 +1,11 @@
+import { DataSource, Repository } from '@n8n/typeorm';
+import { Service } from 'typedi';
+
+import { ApiKey } from '../entities/api-key';
+
+@Service()
+export class ApiKeyRepository extends Repository<ApiKey> {
+	constructor(dataSource: DataSource) {
+		super(ApiKey, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/databases/repositories/execution-annotation.repository.ts b/packages/cli/src/databases/repositories/execution-annotation.repository.ts
index 81d4917173..97ca972733 100644
--- a/packages/cli/src/databases/repositories/execution-annotation.repository.ts
+++ b/packages/cli/src/databases/repositories/execution-annotation.repository.ts
@@ -1,7 +1,7 @@
 import { DataSource, Repository } from '@n8n/typeorm';
 import { Service } from 'typedi';
 
-import { ExecutionAnnotation } from '@/databases/entities/execution-annotation';
+import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
 
 @Service()
 export class ExecutionAnnotationRepository extends Repository<ExecutionAnnotation> {
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index 52c7fd65f3..7b26463969 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -36,24 +36,26 @@ import type {
 import { Service } from 'typedi';
 
 import config from '@/config';
-import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
-import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping';
-import { ExecutionAnnotation } from '@/databases/entities/execution-annotation';
+import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
+import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
+import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
 import { PostgresLiveRowsRetrievalError } from '@/errors/postgres-live-rows-retrieval.error';
 import type { ExecutionSummaries } from '@/executions/execution.types';
 import type {
-	ExecutionPayload,
+	CreateExecutionPayload,
 	IExecutionBase,
 	IExecutionFlattedDb,
 	IExecutionResponse,
 } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { separate } from '@/utils';
 
 import { ExecutionDataRepository } from './execution-data.repository';
 import type { ExecutionData } from '../entities/execution-data';
 import { ExecutionEntity } from '../entities/execution-entity';
 import { ExecutionMetadata } from '../entities/execution-metadata';
+import { SharedWorkflow } from '../entities/shared-workflow';
+import { WorkflowEntity } from '../entities/workflow-entity';
 
 export interface IGetExecutionsQueryFilter {
 	id?: FindOperator<string> | string;
@@ -196,7 +198,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		return executions.map((execution) => {
 			const { executionData, ...rest } = execution;
 			return rest;
-		});
+		}) as IExecutionFlattedDb[] | IExecutionResponse[] | IExecutionBase[];
 	}
 
 	reportInvalidExecutions(executions: ExecutionEntity[]) {
@@ -295,15 +297,15 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			}),
 			...(options?.includeAnnotation &&
 				serializedAnnotation && { annotation: serializedAnnotation }),
-		};
+		} as IExecutionFlattedDb | IExecutionResponse | IExecutionBase;
 	}
 
 	/**
 	 * Insert a new execution and its execution data using a transaction.
 	 */
-	async createNewExecution(execution: ExecutionPayload): Promise<string> {
+	async createNewExecution(execution: CreateExecutionPayload): Promise<string> {
 		const { data, workflowData, ...rest } = execution;
-		const { identifiers: inserted } = await this.insert(rest);
+		const { identifiers: inserted } = await this.insert({ ...rest, createdAt: new Date() });
 		const { id: executionId } = inserted[0] as { id: string };
 		const { connections, nodes, name, settings } = workflowData ?? {};
 		await this.executionDataRepository.insert({
@@ -338,20 +340,25 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		]);
 	}
 
-	async updateStatus(executionId: string, status: ExecutionStatus) {
-		await this.update({ id: executionId }, { status });
-	}
+	async setRunning(executionId: string) {
+		const startedAt = new Date();
 
-	async resetStartedAt(executionId: string) {
-		await this.update({ id: executionId }, { startedAt: new Date() });
+		await this.update({ id: executionId }, { status: 'running', startedAt });
+
+		return startedAt;
 	}
 
 	async updateExistingExecution(executionId: string, execution: Partial<IExecutionResponse>) {
-		// Se isolate startedAt because it must be set when the execution starts and should never change.
-		// So we prevent updating it, if it's sent (it usually is and causes problems to executions that
-		// are resumed after waiting for some time, as a new startedAt is set)
-		const { id, data, workflowId, workflowData, startedAt, customData, ...executionInformation } =
-			execution;
+		const {
+			id,
+			data,
+			workflowId,
+			workflowData,
+			createdAt, // must never change
+			startedAt, // must never change
+			customData,
+			...executionInformation
+		} = execution;
 		if (Object.keys(executionInformation).length > 0) {
 			await this.update({ id: executionId }, executionInformation);
 		}
@@ -719,6 +726,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		mode: true,
 		retryOf: true,
 		status: true,
+		createdAt: true,
 		startedAt: true,
 		stoppedAt: true,
 	};
@@ -804,6 +812,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 	// @tech_debt: These transformations should not be needed
 	private toSummary(execution: {
 		id: number | string;
+		createdAt?: Date | string;
 		startedAt?: Date | string;
 		stoppedAt?: Date | string;
 		waitTill?: Date | string | null;
@@ -815,6 +824,13 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			return date;
 		};
 
+		if (execution.createdAt) {
+			execution.createdAt =
+				execution.createdAt instanceof Date
+					? execution.createdAt.toISOString()
+					: normalizeDateString(execution.createdAt);
+		}
+
 		if (execution.startedAt) {
 			execution.startedAt =
 				execution.startedAt instanceof Date
@@ -874,6 +890,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			metadata,
 			annotationTags,
 			vote,
+			projectId,
 		} = query;
 
 		const fields = Object.keys(this.summaryFields)
@@ -945,6 +962,12 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			}
 		}
 
+		if (projectId) {
+			qb.innerJoin(WorkflowEntity, 'w', 'w.id = execution.workflowId')
+				.innerJoin(SharedWorkflow, 'sw', 'sw.workflowId = w.id')
+				.where('sw.projectId = :projectId', { projectId });
+		}
+
 		return qb;
 	}
 
diff --git a/packages/cli/src/databases/repositories/processed-data.repository.ts b/packages/cli/src/databases/repositories/processed-data.repository.ts
new file mode 100644
index 0000000000..f02fbf270a
--- /dev/null
+++ b/packages/cli/src/databases/repositories/processed-data.repository.ts
@@ -0,0 +1,11 @@
+import { DataSource, Repository } from '@n8n/typeorm';
+import { Service } from 'typedi';
+
+import { ProcessedData } from '../entities/processed-data';
+
+@Service()
+export class ProcessedDataRepository extends Repository<ProcessedData> {
+	constructor(dataSource: DataSource) {
+		super(ProcessedData, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/databases/subscribers/user-subscriber.ts b/packages/cli/src/databases/subscribers/user-subscriber.ts
index 4bb2cc98d3..2f9e698890 100644
--- a/packages/cli/src/databases/subscribers/user-subscriber.ts
+++ b/packages/cli/src/databases/subscribers/user-subscriber.ts
@@ -3,7 +3,7 @@ import { EventSubscriber } from '@n8n/typeorm';
 import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
 import { Container } from 'typedi';
 
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import { Project } from '../entities/project';
 import { User } from '../entities/user';
diff --git a/packages/cli/src/databases/types.ts b/packages/cli/src/databases/types.ts
index 21bfdc025a..2bb1802bf2 100644
--- a/packages/cli/src/databases/types.ts
+++ b/packages/cli/src/databases/types.ts
@@ -1,7 +1,7 @@
 import type { QueryRunner, ObjectLiteral } from '@n8n/typeorm';
 import type { INodeTypes } from 'n8n-workflow';
 
-import type { Logger } from '@/logger';
+import type { Logger } from '@/logging/logger.service';
 
 import type { createSchemaBuilder } from './dsl';
 
diff --git a/packages/cli/src/databases/utils/migration-helpers.ts b/packages/cli/src/databases/utils/migration-helpers.ts
index 9d29e3fbe5..1093096f43 100644
--- a/packages/cli/src/databases/utils/migration-helpers.ts
+++ b/packages/cli/src/databases/utils/migration-helpers.ts
@@ -9,7 +9,7 @@ import { Container } from 'typedi';
 import { inTest } from '@/constants';
 import { createSchemaBuilder } from '@/databases/dsl';
 import type { BaseMigration, Migration, MigrationContext, MigrationFn } from '@/databases/types';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 
 const PERSONALIZATION_SURVEY_FILENAME = 'personalizationSurvey.json';
diff --git a/packages/cli/src/decorators/debounce.ts b/packages/cli/src/decorators/debounce.ts
new file mode 100644
index 0000000000..6096ce522a
--- /dev/null
+++ b/packages/cli/src/decorators/debounce.ts
@@ -0,0 +1,37 @@
+import debounce from 'lodash/debounce';
+
+/**
+ * Debounce a class method using `lodash/debounce`.
+ *
+ * @param waitMs - Number of milliseconds to debounce method by.
+ *
+ * @example
+ * ```
+ * class MyClass {
+ *   @Debounce(1000)
+ *   async myMethod() {
+ *     // debounced
+ *   }
+ * }
+ * ```
+ */
+export const Debounce =
+	(waitMs: number): MethodDecorator =>
+	<T>(
+		_: object,
+		methodName: string,
+		originalDescriptor: PropertyDescriptor,
+	): TypedPropertyDescriptor<T> => ({
+		configurable: true,
+
+		get() {
+			const debouncedFn = debounce(originalDescriptor.value, waitMs);
+
+			Object.defineProperty(this, methodName, {
+				configurable: false,
+				value: debouncedFn,
+			});
+
+			return debouncedFn as T;
+		},
+	});
diff --git a/packages/cli/src/decorators/redactable.ts b/packages/cli/src/decorators/redactable.ts
index 51d02c5c3d..e2df19daa6 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 '@/events/relay-event-map';
+import type { UserLike } from '@/events/maps/relay.event-map';
 
 function toRedactable(userLike: UserLike) {
 	return {
diff --git a/packages/cli/src/deduplication/deduplication-helper.ts b/packages/cli/src/deduplication/deduplication-helper.ts
new file mode 100644
index 0000000000..a913a21a8c
--- /dev/null
+++ b/packages/cli/src/deduplication/deduplication-helper.ts
@@ -0,0 +1,356 @@
+import { createHash } from 'crypto';
+import {
+	type ICheckProcessedContextData,
+	type IDataDeduplicator,
+	type ICheckProcessedOptions,
+	type IDeduplicationOutput,
+	type DeduplicationScope,
+	type DeduplicationItemTypes,
+	type DeduplicationMode,
+	tryToParseDateTime,
+} from 'n8n-workflow';
+import * as assert from 'node:assert/strict';
+import { Container } from 'typedi';
+
+import type { ProcessedData } from '@/databases/entities/processed-data';
+import { ProcessedDataRepository } from '@/databases/repositories/processed-data.repository';
+import { DeduplicationError } from '@/errors/deduplication.error';
+import type { IProcessedDataEntries, IProcessedDataLatest } from '@/interfaces';
+
+export class DeduplicationHelper implements IDataDeduplicator {
+	private static sortEntries(
+		items: DeduplicationItemTypes[],
+		mode: DeduplicationMode,
+	): DeduplicationItemTypes[] {
+		return items.slice().sort((a, b) => DeduplicationHelper.compareValues(mode, a, b));
+	}
+	/**
+	 * Compares two values based on the provided mode ('latestIncrementalKey' or 'latestDate').
+	 *
+	 * @param {DeduplicationMode} mode - The mode to determine the comparison logic. Can be either:
+	 *   - 'latestIncrementalKey': Compares numeric values and returns true if `value1` is greater than `value2`.
+	 *   - 'latestDate': Compares date strings and returns true if `value1` is a later date than `value2`.
+	 *
+	 * @param {DeduplicationItemTypes} value1 - The first value to compare.
+	 *   - If the mode is 'latestIncrementalKey', this should be a numeric value or a string that can be converted to a number.
+	 *   - If the mode is 'latestDate', this should be a valid date string.
+	 *
+	 * @param {DeduplicationItemTypes} value2 - The second value to compare.
+	 *   - If the mode is 'latestIncrementalKey', this should be a numeric value or a string that can be converted to a number.
+	 *   - If the mode is 'latestDate', this should be a valid date string.
+	 *
+	 * @returns {boolean} - Returns `true` if `value1` is greater than `value2` based on the comparison mode.
+	 *   - In 'latestIncrementalKey' mode, it returns `true` if `value1` is numerically greater than `value2`.
+	 *   - In 'latestDate' mode, it returns `true` if `value1` is a later date than `value2`.
+	 *
+	 * @throws {DeduplicationError} - Throws an error if:
+	 *   - The mode is 'latestIncrementalKey' and the values are not valid numbers.
+	 *   - The mode is 'latestDate' and the values are not valid date strings.
+	 *   - An unsupported mode is provided.
+	 */
+
+	private static compareValues(
+		mode: DeduplicationMode,
+		value1: DeduplicationItemTypes,
+		value2: DeduplicationItemTypes,
+	): 1 | 0 | -1 {
+		if (mode === 'latestIncrementalKey') {
+			const num1 = Number(value1);
+			const num2 = Number(value2);
+			if (!isNaN(num1) && !isNaN(num2)) {
+				return num1 === num2 ? 0 : num1 > num2 ? 1 : -1;
+			}
+			throw new DeduplicationError(
+				'Invalid value. Only numbers are supported in mode "latestIncrementalKey"',
+			);
+		} else if (mode === 'latestDate') {
+			try {
+				const date1 = tryToParseDateTime(value1);
+				const date2 = tryToParseDateTime(value2);
+
+				return date1 === date2 ? 0 : date1 > date2 ? 1 : -1;
+			} catch (error) {
+				throw new DeduplicationError(
+					'Invalid value. Only valid dates are supported in mode "latestDate"',
+				);
+			}
+		} else {
+			throw new DeduplicationError(
+				"Invalid mode. Only 'latestIncrementalKey' and 'latestDate' are supported.",
+			);
+		}
+	}
+
+	private static createContext(
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+	): string {
+		if (scope === 'node') {
+			if (!contextData.node) {
+				throw new DeduplicationError(
+					"No node information has been provided and so cannot use scope 'node'",
+				);
+			}
+			// Use the node ID to make sure that the data can still be accessed and does not get deleted
+			// whenever the node gets renamed
+			return `n:${contextData.node.id}`;
+		}
+		return '';
+	}
+
+	private static createValueHash(value: DeduplicationItemTypes): string {
+		return createHash('md5').update(value.toString()).digest('base64');
+	}
+
+	private async findProcessedData(
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+	): Promise<ProcessedData | null> {
+		return await Container.get(ProcessedDataRepository).findOne({
+			where: {
+				workflowId: contextData.workflow.id,
+				context: DeduplicationHelper.createContext(scope, contextData),
+			},
+		});
+	}
+
+	private validateMode(processedData: ProcessedData | null, options: ICheckProcessedOptions) {
+		if (processedData && processedData.value.mode !== options.mode) {
+			throw new DeduplicationError(
+				'Deduplication data was originally saved with an incompatible setting of the ‘Keep Items Where’ parameter. Try ’Clean Database’ operation to reset.',
+			);
+		}
+	}
+
+	private processedDataHasEntries(
+		data: IProcessedDataEntries | IProcessedDataLatest,
+	): data is IProcessedDataEntries {
+		return Array.isArray(data.data);
+	}
+
+	private processedDataIsLatest(
+		data: IProcessedDataEntries | IProcessedDataLatest,
+	): data is IProcessedDataLatest {
+		return data && !Array.isArray(data.data);
+	}
+
+	private async handleLatestModes(
+		items: DeduplicationItemTypes[],
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+		processedData: ProcessedData | null,
+		dbContext: string,
+	): Promise<IDeduplicationOutput> {
+		const incomingItems = DeduplicationHelper.sortEntries(items, options.mode);
+
+		if (!processedData) {
+			// All items are new so add new entries
+			await Container.get(ProcessedDataRepository).insert({
+				workflowId: contextData.workflow.id,
+				context: dbContext,
+				value: {
+					mode: options.mode,
+					data: incomingItems.pop(),
+				},
+			});
+
+			return {
+				new: items,
+				processed: [],
+			};
+		}
+
+		const returnData: IDeduplicationOutput = {
+			new: [],
+			processed: [],
+		};
+
+		if (!this.processedDataIsLatest(processedData.value)) {
+			return returnData;
+		}
+
+		let largestValue = processedData.value.data;
+		const processedDataValue = processedData.value;
+
+		incomingItems.forEach((item) => {
+			if (DeduplicationHelper.compareValues(options.mode, item, processedDataValue.data) === 1) {
+				returnData.new.push(item);
+				if (DeduplicationHelper.compareValues(options.mode, item, largestValue) === 1) {
+					largestValue = item;
+				}
+			} else {
+				returnData.processed.push(item);
+			}
+		});
+
+		processedData.value.data = largestValue;
+
+		await Container.get(ProcessedDataRepository).update(
+			{ workflowId: processedData.workflowId, context: processedData.context },
+			processedData,
+		);
+
+		return returnData;
+	}
+
+	private async handleHashedItems(
+		items: DeduplicationItemTypes[],
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+		processedData: ProcessedData | null,
+		dbContext: string,
+	): Promise<IDeduplicationOutput> {
+		const hashedItems = items.map((item) => DeduplicationHelper.createValueHash(item));
+
+		if (!processedData) {
+			// All items are new so add new entries
+			if (options.maxEntries) {
+				hashedItems.splice(0, hashedItems.length - options.maxEntries);
+			}
+			await Container.get(ProcessedDataRepository).insert({
+				workflowId: contextData.workflow.id,
+				context: dbContext,
+				value: {
+					mode: options.mode,
+					data: hashedItems,
+				},
+			});
+
+			return {
+				new: items,
+				processed: [],
+			};
+		}
+
+		const returnData: IDeduplicationOutput = {
+			new: [],
+			processed: [],
+		};
+
+		if (!this.processedDataHasEntries(processedData.value)) {
+			return returnData;
+		}
+
+		const processedDataValue = processedData.value;
+		const processedItemsSet = new Set(processedDataValue.data);
+
+		hashedItems.forEach((item, index) => {
+			if (processedItemsSet.has(item)) {
+				returnData.processed.push(items[index]);
+			} else {
+				returnData.new.push(items[index]);
+				processedDataValue.data.push(item);
+			}
+		});
+
+		if (options.maxEntries) {
+			processedDataValue.data.splice(0, processedDataValue.data.length - options.maxEntries);
+		}
+
+		await Container.get(ProcessedDataRepository).update(
+			{ workflowId: processedData.workflowId, context: processedData.context },
+			processedData,
+		);
+
+		return returnData;
+	}
+
+	async checkProcessedAndRecord(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutput> {
+		const dbContext = DeduplicationHelper.createContext(scope, contextData);
+
+		assert.ok(contextData.workflow.id);
+
+		const processedData = await this.findProcessedData(scope, contextData);
+
+		this.validateMode(processedData, options);
+
+		if (['latestIncrementalKey', 'latestDate'].includes(options.mode)) {
+			return await this.handleLatestModes(items, contextData, options, processedData, dbContext);
+		}
+		//mode entries
+		return await this.handleHashedItems(items, contextData, options, processedData, dbContext);
+	}
+
+	async removeProcessed(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<void> {
+		if (['latestIncrementalKey', 'latestDate'].includes(options.mode)) {
+			throw new DeduplicationError('Removing processed data is not possible in mode "latest"');
+		}
+		assert.ok(contextData.workflow.id);
+
+		const processedData = await Container.get(ProcessedDataRepository).findOne({
+			where: {
+				workflowId: contextData.workflow.id,
+				context: DeduplicationHelper.createContext(scope, contextData),
+			},
+		});
+
+		if (!processedData) {
+			return;
+		}
+
+		const hashedItems = items.map((item) => DeduplicationHelper.createValueHash(item));
+
+		if (!this.processedDataHasEntries(processedData.value)) {
+			return;
+		}
+
+		const processedDataValue = processedData.value;
+
+		hashedItems.forEach((item) => {
+			const index = processedDataValue.data.findIndex((value) => value === item);
+			if (index !== -1) {
+				processedDataValue.data.splice(index, 1);
+			}
+		});
+
+		await Container.get(ProcessedDataRepository).update(
+			{ workflowId: processedData.workflowId, context: processedData.context },
+			processedData,
+		);
+	}
+
+	async clearAllProcessedItems(
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+	): Promise<void> {
+		await Container.get(ProcessedDataRepository).delete({
+			workflowId: contextData.workflow.id,
+			context: DeduplicationHelper.createContext(scope, contextData),
+		});
+	}
+
+	async getProcessedDataCount(
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<number> {
+		const processedDataRepository = Container.get(ProcessedDataRepository);
+
+		const processedData = await processedDataRepository.findOne({
+			where: {
+				workflowId: contextData.workflow.id,
+				context: DeduplicationHelper.createContext(scope, contextData),
+			},
+		});
+
+		if (
+			options.mode === 'entries' &&
+			processedData &&
+			this.processedDataHasEntries(processedData.value)
+		) {
+			return processedData.value.data.length;
+		} else {
+			return 0;
+		}
+	}
+}
diff --git a/packages/cli/src/deduplication/index.ts b/packages/cli/src/deduplication/index.ts
new file mode 100644
index 0000000000..2cf2973d71
--- /dev/null
+++ b/packages/cli/src/deduplication/index.ts
@@ -0,0 +1,7 @@
+import { type IDataDeduplicator } from 'n8n-workflow';
+
+import { DeduplicationHelper } from './deduplication-helper';
+
+export function getDataDeduplicationService(): IDataDeduplicator {
+	return new DeduplicationHelper();
+}
diff --git a/packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts b/packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts
new file mode 100644
index 0000000000..06dab4f97c
--- /dev/null
+++ b/packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts
@@ -0,0 +1,46 @@
+import { mock } from 'jest-mock-extended';
+import { InstanceSettings } from 'n8n-core';
+
+import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
+import { SourceControlService } from '@/environments/source-control/source-control.service.ee';
+
+describe('SourceControlService', () => {
+	const preferencesService = new SourceControlPreferencesService(
+		new InstanceSettings(),
+		mock(),
+		mock(),
+	);
+	const sourceControlService = new SourceControlService(
+		mock(),
+		mock(),
+		preferencesService,
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+	);
+
+	describe('pushWorkfolder', () => {
+		it('should throw an error if a file is given that is not in the workfolder', async () => {
+			jest.spyOn(sourceControlService, 'sanityCheck').mockResolvedValue(undefined);
+
+			await expect(
+				sourceControlService.pushWorkfolder({
+					fileNames: [
+						{
+							file: '/etc/passwd',
+							id: 'test',
+							name: 'secret-file',
+							type: 'file',
+							status: 'modified',
+							location: 'local',
+							conflict: false,
+							updatedAt: new Date().toISOString(),
+							pushed: false,
+						},
+					],
+				}),
+			).rejects.toThrow('File path /etc/passwd is invalid');
+		});
+	});
+});
diff --git a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments/source-control/source-control-export.service.ee.ts
index 321534ff6c..9c495bbb8d 100644
--- a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control-export.service.ee.ts
@@ -11,7 +11,7 @@ import { SharedWorkflowRepository } from '@/databases/repositories/shared-workfl
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import {
 	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
diff --git a/packages/cli/src/environments/source-control/source-control-git.service.ee.ts b/packages/cli/src/environments/source-control/source-control-git.service.ee.ts
index 14cdb9e81a..99571cdd52 100644
--- a/packages/cli/src/environments/source-control/source-control-git.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control-git.service.ee.ts
@@ -14,7 +14,7 @@ import type {
 import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { OwnershipService } from '@/services/ownership.service';
 
 import {
diff --git a/packages/cli/src/environments/source-control/source-control-helper.ee.ts b/packages/cli/src/environments/source-control/source-control-helper.ee.ts
index 29393c5efe..00a9875741 100644
--- a/packages/cli/src/environments/source-control/source-control-helper.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control-helper.ee.ts
@@ -1,10 +1,13 @@
 import { generateKeyPairSync } from 'crypto';
 import { constants as fsConstants, mkdirSync, accessSync } from 'fs';
+import { ApplicationError } from 'n8n-workflow';
+import { ok } from 'node:assert/strict';
 import path from 'path';
 import { Container } from 'typedi';
 
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
+import { isContainedWithin } from '@/utils/path-util';
 
 import {
 	SOURCE_CONTROL_GIT_KEY_COMMENT,
@@ -163,3 +166,24 @@ export function getTrackingInformationFromPostPushResult(result: SourceControlle
 			uniques.filter((file) => file.pushed && file.file.startsWith('variable_stubs')).length ?? 0,
 	};
 }
+
+/**
+ * Normalizes and validates the given source controlled file path. Ensures
+ * the path is absolute and contained within the git folder.
+ *
+ * @throws {ApplicationError} If the path is not within the git folder
+ */
+export function normalizeAndValidateSourceControlledFilePath(
+	gitFolderPath: string,
+	filePath: string,
+) {
+	ok(path.isAbsolute(gitFolderPath), 'gitFolder must be an absolute path');
+
+	const normalizedPath = path.isAbsolute(filePath) ? filePath : path.join(gitFolderPath, filePath);
+
+	if (!isContainedWithin(gitFolderPath, filePath)) {
+		throw new ApplicationError(`File path ${filePath} is invalid`);
+	}
+
+	return normalizedPath;
+}
diff --git a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments/source-control/source-control-import.service.ee.ts
index fb491f39d2..b5012d2762 100644
--- a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control-import.service.ee.ts
@@ -2,7 +2,12 @@
 import { In } from '@n8n/typeorm';
 import glob from 'fast-glob';
 import { Credentials, InstanceSettings } from 'n8n-core';
-import { ApplicationError, jsonParse, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import {
+	ApplicationError,
+	jsonParse,
+	ErrorReporterProxy as ErrorReporter,
+	ensureError,
+} from 'n8n-workflow';
 import { readFile as fsReadFile } from 'node:fs/promises';
 import path from 'path';
 import { Container, Service } from 'typedi';
@@ -23,7 +28,7 @@ import { VariablesRepository } from '@/databases/repositories/variables.reposito
 import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { IWorkflowToImport } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { isUniqueConstraintError } from '@/response-helper';
 import { assertNever } from '@/utils';
 
@@ -274,8 +279,9 @@ export class SourceControlImportService {
 					this.logger.debug(`Reactivating workflow id ${existingWorkflow.id}`);
 					await workflowManager.add(existingWorkflow.id, 'activate');
 					// update the versionId of the workflow to match the imported workflow
-				} catch (error) {
-					this.logger.error(`Failed to activate workflow ${existingWorkflow.id}`, error as Error);
+				} catch (e) {
+					const error = ensureError(e);
+					this.logger.error(`Failed to activate workflow ${existingWorkflow.id}`, { error });
 				} finally {
 					await Container.get(WorkflowRepository).update(
 						{ id: existingWorkflow.id },
@@ -377,8 +383,9 @@ export class SourceControlImportService {
 				await fsReadFile(candidate.file, { encoding: 'utf8' }),
 				{ fallbackValue: { tags: [], mappings: [] } },
 			);
-		} catch (error) {
-			this.logger.error(`Failed to import tags from file ${candidate.file}`, error as Error);
+		} catch (e) {
+			const error = ensureError(e);
+			this.logger.error(`Failed to import tags from file ${candidate.file}`, { error });
 			return;
 		}
 
@@ -444,8 +451,8 @@ export class SourceControlImportService {
 				await fsReadFile(candidate.file, { encoding: 'utf8' }),
 				{ fallbackValue: [] },
 			);
-		} catch (error) {
-			this.logger.error(`Failed to import tags from file ${candidate.file}`, error as Error);
+		} catch (e) {
+			this.logger.error(`Failed to import tags from file ${candidate.file}`, { error: e });
 			return;
 		}
 		const overriddenKeys = Object.keys(valueOverrides ?? {});
diff --git a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts b/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
index a99c5fb3e8..d3a34d784f 100644
--- a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
@@ -9,7 +9,7 @@ import Container, { Service } from 'typedi';
 
 import config from '@/config';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import {
 	SOURCE_CONTROL_SSH_FOLDER,
diff --git a/packages/cli/src/environments/source-control/source-control.controller.ee.ts b/packages/cli/src/environments/source-control/source-control.controller.ee.ts
index 7e41fd7cae..7b8b2a7266 100644
--- a/packages/cli/src/environments/source-control/source-control.controller.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control.controller.ee.ts
@@ -170,6 +170,7 @@ export class SourceControlController {
 		if (this.sourceControlPreferencesService.isBranchReadOnly()) {
 			throw new BadRequestError('Cannot push onto read-only branch.');
 		}
+
 		try {
 			await this.sourceControlService.setGitUserDetails(
 				`${req.user.firstName} ${req.user.lastName}`,
diff --git a/packages/cli/src/environments/source-control/source-control.service.ee.ts b/packages/cli/src/environments/source-control/source-control.service.ee.ts
index 11340a0e15..58c213f03c 100644
--- a/packages/cli/src/environments/source-control/source-control.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control.service.ee.ts
@@ -10,7 +10,7 @@ import type { Variables } from '@/databases/entities/variables';
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import {
 	SOURCE_CONTROL_DEFAULT_EMAIL,
@@ -25,6 +25,7 @@ import {
 	getTrackingInformationFromPrePushResult,
 	getTrackingInformationFromPullResult,
 	getVariablesPath,
+	normalizeAndValidateSourceControlledFilePath,
 	sourceControlFoldersExistCheck,
 } from './source-control-helper.ee';
 import { SourceControlImportService } from './source-control-import.service.ee';
@@ -80,7 +81,7 @@ export class SourceControlService {
 		});
 	}
 
-	private async sanityCheck(): Promise<void> {
+	public async sanityCheck(): Promise<void> {
 		try {
 			const foldersExisted = sourceControlFoldersExistCheck(
 				[this.gitFolder, this.sshFolder],
@@ -217,8 +218,20 @@ export class SourceControlService {
 			throw new BadRequestError('Cannot push onto read-only branch.');
 		}
 
+		const filesToPush = options.fileNames.map((file) => {
+			const normalizedPath = normalizeAndValidateSourceControlledFilePath(
+				this.gitFolder,
+				file.file,
+			);
+
+			return {
+				...file,
+				file: normalizedPath,
+			};
+		});
+
 		// only determine file status if not provided by the frontend
-		let statusResult: SourceControlledFile[] = options.fileNames;
+		let statusResult: SourceControlledFile[] = filesToPush;
 		if (statusResult.length === 0) {
 			statusResult = (await this.getStatus({
 				direction: 'push',
@@ -240,7 +253,7 @@ export class SourceControlService {
 
 		const filesToBePushed = new Set<string>();
 		const filesToBeDeleted = new Set<string>();
-		options.fileNames.forEach((e) => {
+		filesToPush.forEach((e) => {
 			if (e.status !== 'deleted') {
 				filesToBePushed.add(e.file);
 			} else {
@@ -250,12 +263,12 @@ export class SourceControlService {
 
 		this.sourceControlExportService.rmFilesFromExportFolder(filesToBeDeleted);
 
-		const workflowsToBeExported = options.fileNames.filter(
+		const workflowsToBeExported = filesToPush.filter(
 			(e) => e.type === 'workflow' && e.status !== 'deleted',
 		);
 		await this.sourceControlExportService.exportWorkflowsToWorkFolder(workflowsToBeExported);
 
-		const credentialsToBeExported = options.fileNames.filter(
+		const credentialsToBeExported = filesToPush.filter(
 			(e) => e.type === 'credential' && e.status !== 'deleted',
 		);
 		const credentialExportResult =
@@ -269,11 +282,11 @@ export class SourceControlService {
 			});
 		}
 
-		if (options.fileNames.find((e) => e.type === 'tags')) {
+		if (filesToPush.find((e) => e.type === 'tags')) {
 			await this.sourceControlExportService.exportTagsToWorkFolder();
 		}
 
-		if (options.fileNames.find((e) => e.type === 'variables')) {
+		if (filesToPush.find((e) => e.type === 'variables')) {
 			await this.sourceControlExportService.exportVariablesToWorkFolder();
 		}
 
@@ -281,7 +294,7 @@ export class SourceControlService {
 
 		for (let i = 0; i < statusResult.length; i++) {
 			// eslint-disable-next-line @typescript-eslint/no-loop-func
-			if (options.fileNames.find((file) => file.file === statusResult[i].file)) {
+			if (filesToPush.find((file) => file.file === statusResult[i].file)) {
 				statusResult[i].pushed = true;
 			}
 		}
diff --git a/packages/cli/src/error-reporting.ts b/packages/cli/src/error-reporting.ts
index d1ecd39198..e429bdbd30 100644
--- a/packages/cli/src/error-reporting.ts
+++ b/packages/cli/src/error-reporting.ts
@@ -1,6 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { QueryFailedError } from '@n8n/typeorm';
+import { AxiosError } from 'axios';
 import { createHash } from 'crypto';
 import { ErrorReporterProxy, ApplicationError } from 'n8n-workflow';
 import Container from 'typedi';
@@ -67,6 +68,8 @@ export const initErrorHandling = async () => {
 		beforeSend(event, { originalException }) {
 			if (!originalException) return null;
 
+			if (originalException instanceof AxiosError) return null;
+
 			if (
 				originalException instanceof QueryFailedError &&
 				['SQLITE_FULL', 'SQLITE_IOERR'].some((errMsg) => originalException.message.includes(errMsg))
diff --git a/packages/cli/src/errors/deduplication.error.ts b/packages/cli/src/errors/deduplication.error.ts
new file mode 100644
index 0000000000..8e9173abb9
--- /dev/null
+++ b/packages/cli/src/errors/deduplication.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class DeduplicationError extends ApplicationError {
+	constructor(message: string) {
+		super(`Deduplication Failed: ${message}`);
+	}
+}
diff --git a/packages/cli/src/errors/port-taken.error.ts b/packages/cli/src/errors/port-taken.error.ts
deleted file mode 100644
index 30c63a679f..0000000000
--- a/packages/cli/src/errors/port-taken.error.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ApplicationError } from 'n8n-workflow';
-
-export class PortTakenError extends ApplicationError {
-	constructor(port: number) {
-		super(
-			`Port ${port} is already in use. Do you already have the n8n main process running on that port?`,
-		);
-	}
-}
diff --git a/packages/cli/src/errors/response-errors/webhook-not-found.error.ts b/packages/cli/src/errors/response-errors/webhook-not-found.error.ts
index 648a7a0106..8b2d8bd26c 100644
--- a/packages/cli/src/errors/response-errors/webhook-not-found.error.ts
+++ b/packages/cli/src/errors/response-errors/webhook-not-found.error.ts
@@ -47,10 +47,13 @@ export class WebhookNotFoundError extends NotFoundError {
 	) {
 		const errorMsg = webhookNotFoundErrorMessage({ path, httpMethod, webhookMethods });
 
-		const hintMsg =
-			hint === 'default'
-				? "Click the 'Test workflow' button on the canvas, then try again. (In test mode, the webhook only works for one call after you click this button)"
-				: "The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
+		let hintMsg = '';
+		if (!webhookMethods?.length) {
+			hintMsg =
+				hint === 'default'
+					? "Click the 'Test workflow' button on the canvas, then try again. (In test mode, the webhook only works for one call after you click this button)"
+					: "The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
+		}
 
 		super(errorMsg, hintMsg);
 	}
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts
index d901346d7e..4046855f30 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts
@@ -2,7 +2,7 @@ import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import type { EventDestinations } from '@/databases/entities/event-destinations';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import { MessageEventBusDestinationSentry } from './message-event-bus-destination-sentry.ee';
 import { MessageEventBusDestinationSyslog } from './message-event-bus-destination-syslog.ee';
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts
index dc1727cb0c..83db469d79 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts
@@ -7,7 +7,7 @@ import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import syslog from 'syslog-client';
 import Container from 'typedi';
 
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import { MessageEventBusDestination } from './message-event-bus-destination.ee';
 import { eventMessageGenericDestinationTestEvent } from '../event-message-classes/event-message-generic';
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts
index f6a35f4329..a5373d0cc5 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts
@@ -180,7 +180,7 @@ export class MessageEventBusDestinationWebhook
 				try {
 					JSON.parse(this.jsonQuery);
 				} catch {
-					this.logger.error('JSON parameter need to be an valid JSON');
+					this.logger.error('JSON parameter needs to be valid JSON');
 				}
 				this.axiosRequestOptions.params = jsonParse(this.jsonQuery);
 			}
@@ -198,7 +198,7 @@ export class MessageEventBusDestinationWebhook
 				try {
 					JSON.parse(this.jsonHeaders);
 				} catch {
-					this.logger.error('JSON parameter need to be an valid JSON');
+					this.logger.error('JSON parameter needs to be valid JSON');
 				}
 				this.axiosRequestOptions.headers = jsonParse(this.jsonHeaders);
 			}
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts
index 4d6725ff2c..7b65767b04 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts
@@ -5,7 +5,7 @@ import { v4 as uuid } from 'uuid';
 
 import { EventDestinationsRepository } from '@/databases/repositories/event-destinations.repository';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import type { EventMessageTypes } from '../event-message-classes';
 import type { AbstractEventMessage } from '../event-message-classes/abstract-event-message';
diff --git a/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts b/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
index 6b009f38e9..6c6a928a67 100644
--- a/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
+++ b/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
@@ -12,7 +12,7 @@ import Container from 'typedi';
 import { Worker } from 'worker_threads';
 
 import { inTest } from '@/constants';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import type { EventMessageTypes } from '../event-message-classes';
 import { isEventMessageOptions } from '../event-message-classes/abstract-event-message';
@@ -149,7 +149,7 @@ export class MessageEventBusLogWriter {
 		this._worker = new Worker(workerFileName);
 		if (this.worker) {
 			this.worker.on('messageerror', async (error) => {
-				this.logger.error('Event Bus Log Writer thread error, attempting to restart...', error);
+				this.logger.error('Event Bus Log Writer thread error, attempting to restart...', { error });
 				await MessageEventBusLogWriter.instance.startThread();
 			});
 			return true;
diff --git a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts
index cf9a585478..0f622c2317 100644
--- a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts
+++ b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts
@@ -13,7 +13,7 @@ import { EventDestinationsRepository } from '@/databases/repositories/event-dest
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 
 import { ExecutionRecoveryService } from '../../executions/execution-recovery.service';
@@ -210,7 +210,7 @@ export class MessageEventBus extends EventEmitter {
 		this.destinations[destination.getId()] = destination;
 		this.destinations[destination.getId()].startListening();
 		if (notifyWorkers) {
-			await this.orchestrationService.publish('restartEventBus');
+			await this.orchestrationService.publish('restart-event-bus');
 		}
 		return destination;
 	}
@@ -236,7 +236,7 @@ export class MessageEventBus extends EventEmitter {
 			delete this.destinations[id];
 		}
 		if (notifyWorkers) {
-			await this.orchestrationService.publish('restartEventBus');
+			await this.orchestrationService.publish('restart-event-bus');
 		}
 		return result;
 	}
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 d768218950..4727c8ef72 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
@@ -3,8 +3,8 @@ import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
 
 import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { EventService } from '@/events/event.service';
-import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
-import type { RelayEventMap } from '@/events/relay-event-map';
+import type { RelayEventMap } from '@/events/maps/relay.event-map';
+import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay';
 import type { IWorkflowDb } from '@/interfaces';
 
 describe('LogStreamingEventRelay', () => {
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 9a05835205..df65a70ecb 100644
--- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -9,8 +9,8 @@ import type { ProjectRelationRepository } from '@/databases/repositories/project
 import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { EventService } from '@/events/event.service';
-import type { RelayEventMap } from '@/events/relay-event-map';
-import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
+import type { RelayEventMap } from '@/events/maps/relay.event-map';
+import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay';
 import type { IWorkflowDb } from '@/interfaces';
 import type { License } from '@/license';
 import type { NodeTypes } from '@/node-types';
@@ -37,6 +37,10 @@ describe('TelemetryEventRelay', () => {
 				includeQueueMetrics: false,
 			},
 		},
+		logging: {
+			level: 'info',
+			outputs: ['console'],
+		},
 	});
 	const workflowRepository = mock<WorkflowRepository>();
 	const nodeTypes = mock<NodeTypes>();
@@ -1053,4 +1057,20 @@ describe('TelemetryEventRelay', () => {
 			);
 		});
 	});
+
+	describe('Community+ registered', () => {
+		it('should track `license-community-plus-registered` event', () => {
+			const event: RelayEventMap['license-community-plus-registered'] = {
+				email: 'user@example.com',
+				licenseKey: 'license123',
+			};
+
+			eventService.emit('license-community-plus-registered', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User registered for license community plus', {
+				email: 'user@example.com',
+				licenseKey: 'license123',
+			});
+		});
+	});
 });
diff --git a/packages/cli/src/events/event.service.ts b/packages/cli/src/events/event.service.ts
index 10ba7666ef..b8e00ecea7 100644
--- a/packages/cli/src/events/event.service.ts
+++ b/packages/cli/src/events/event.service.ts
@@ -2,11 +2,12 @@ import { Service } from 'typedi';
 
 import { TypedEmitter } from '@/typed-emitter';
 
-import type { AiEventMap } from './ai-event-map';
-import type { QueueMetricsEventMap } from './queue-metrics-event-map';
-import type { RelayEventMap } from './relay-event-map';
+import type { AiEventMap } from './maps/ai.event-map';
+import type { PubSubEventMap } from './maps/pub-sub.event-map';
+import type { QueueMetricsEventMap } from './maps/queue-metrics.event-map';
+import type { RelayEventMap } from './maps/relay.event-map';
 
-type EventMap = RelayEventMap & QueueMetricsEventMap & AiEventMap;
+type EventMap = RelayEventMap & QueueMetricsEventMap & AiEventMap & PubSubEventMap;
 
 @Service()
 export class EventService extends TypedEmitter<EventMap> {}
diff --git a/packages/cli/src/events/ai-event-map.ts b/packages/cli/src/events/maps/ai.event-map.ts
similarity index 100%
rename from packages/cli/src/events/ai-event-map.ts
rename to packages/cli/src/events/maps/ai.event-map.ts
diff --git a/packages/cli/src/events/maps/pub-sub.event-map.ts b/packages/cli/src/events/maps/pub-sub.event-map.ts
new file mode 100644
index 0000000000..ff27741b9b
--- /dev/null
+++ b/packages/cli/src/events/maps/pub-sub.event-map.ts
@@ -0,0 +1,84 @@
+import type { PushType, WorkerStatus } from '@n8n/api-types';
+
+import type { IWorkflowDb } from '@/interfaces';
+
+export type PubSubEventMap = PubSubCommandMap & PubSubWorkerResponseMap;
+
+export type PubSubCommandMap = {
+	// #region Lifecycle
+
+	'reload-license': never;
+
+	'restart-event-bus': never;
+
+	'reload-external-secrets-providers': never;
+
+	// #endregion
+
+	// #region Community packages
+
+	'community-package-install': {
+		packageName: string;
+		packageVersion: string;
+	};
+
+	'community-package-update': {
+		packageName: string;
+		packageVersion: string;
+	};
+
+	'community-package-uninstall': {
+		packageName: string;
+	};
+
+	// #endregion
+
+	// #region Worker view
+
+	'get-worker-id': never;
+
+	'get-worker-status': never;
+
+	// #endregion
+
+	// #region Multi-main setup
+
+	'add-webhooks-triggers-and-pollers': {
+		workflowId: string;
+	};
+
+	'remove-triggers-and-pollers': {
+		workflowId: string;
+	};
+
+	'display-workflow-activation': {
+		workflowId: string;
+	};
+
+	'display-workflow-deactivation': {
+		workflowId: string;
+	};
+
+	'display-workflow-activation-error': {
+		workflowId: string;
+		errorMessage: string;
+	};
+
+	'relay-execution-lifecycle-event': {
+		type: PushType;
+		args: Record<string, unknown>;
+		pushRef: string;
+	};
+
+	'clear-test-webhooks': {
+		webhookKey: string;
+		workflowEntity: IWorkflowDb;
+		pushRef: string;
+	};
+
+	// #endregion
+};
+
+export type PubSubWorkerResponseMap = {
+	'response-to-get-worker-status': WorkerStatus;
+};
diff --git a/packages/cli/src/events/queue-metrics-event-map.ts b/packages/cli/src/events/maps/queue-metrics.event-map.ts
similarity index 100%
rename from packages/cli/src/events/queue-metrics-event-map.ts
rename to packages/cli/src/events/maps/queue-metrics.event-map.ts
diff --git a/packages/cli/src/events/relay-event-map.ts b/packages/cli/src/events/maps/relay.event-map.ts
similarity index 98%
rename from packages/cli/src/events/relay-event-map.ts
rename to packages/cli/src/events/maps/relay.event-map.ts
index a53a36842e..21b673a2b5 100644
--- a/packages/cli/src/events/relay-event-map.ts
+++ b/packages/cli/src/events/maps/relay.event-map.ts
@@ -11,7 +11,7 @@ import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { GlobalRole } from '@/databases/entities/user';
 import type { IWorkflowDb } from '@/interfaces';
 
-import type { AiEventMap } from './ai-event-map';
+import type { AiEventMap } from './ai.event-map';
 
 export type UserLike = {
 	id: string;
@@ -420,6 +420,11 @@ export type RelayEventMap = {
 		success: boolean;
 	};
 
+	'license-community-plus-registered': {
+		email: string;
+		licenseKey: string;
+	};
+
 	// #endregion
 
 	// #region Variable
diff --git a/packages/cli/src/events/event-relay.ts b/packages/cli/src/events/relays/event-relay.ts
similarity index 81%
rename from packages/cli/src/events/event-relay.ts
rename to packages/cli/src/events/relays/event-relay.ts
index 3202b69c15..13e7dc01be 100644
--- a/packages/cli/src/events/event-relay.ts
+++ b/packages/cli/src/events/relays/event-relay.ts
@@ -1,8 +1,7 @@
 import { Service } from 'typedi';
 
-import type { RelayEventMap } from '@/events/relay-event-map';
-
-import { EventService } from './event.service';
+import { EventService } from '@/events/event.service';
+import type { RelayEventMap } from '@/events/maps/relay.event-map';
 
 @Service()
 export class EventRelay {
diff --git a/packages/cli/src/events/log-streaming-event-relay.ts b/packages/cli/src/events/relays/log-streaming.event-relay.ts
similarity index 98%
rename from packages/cli/src/events/log-streaming-event-relay.ts
rename to packages/cli/src/events/relays/log-streaming.event-relay.ts
index 788e5e50c4..c65af2874c 100644
--- a/packages/cli/src/events/log-streaming-event-relay.ts
+++ b/packages/cli/src/events/relays/log-streaming.event-relay.ts
@@ -3,10 +3,9 @@ import { Service } from 'typedi';
 
 import { Redactable } from '@/decorators/redactable';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
-import { EventRelay } from '@/events/event-relay';
-import type { RelayEventMap } from '@/events/relay-event-map';
-
-import { EventService } from './event.service';
+import { EventService } from '@/events/event.service';
+import type { RelayEventMap } from '@/events/maps/relay.event-map';
+import { EventRelay } from '@/events/relays/event-relay';
 
 @Service()
 export class LogStreamingEventRelay extends EventRelay {
diff --git a/packages/cli/src/events/telemetry-event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts
similarity index 98%
rename from packages/cli/src/events/telemetry-event-relay.ts
rename to packages/cli/src/events/relays/telemetry.event-relay.ts
index 82beb17198..11d84751d0 100644
--- a/packages/cli/src/events/telemetry-event-relay.ts
+++ b/packages/cli/src/events/relays/telemetry.event-relay.ts
@@ -12,14 +12,14 @@ import { ProjectRelationRepository } from '@/databases/repositories/project-rela
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { EventService } from '@/events/event.service';
-import type { RelayEventMap } from '@/events/relay-event-map';
+import type { RelayEventMap } from '@/events/maps/relay.event-map';
 import { determineFinalExecutionStatus } from '@/execution-lifecycle-hooks/shared/shared-hook-functions';
 import type { IExecutionTrackProperties } from '@/interfaces';
 import { License } from '@/license';
 import { NodeTypes } from '@/node-types';
 
 import { EventRelay } from './event-relay';
-import { Telemetry } from '../telemetry';
+import { Telemetry } from '../../telemetry';
 
 @Service()
 export class TelemetryEventRelay extends EventRelay {
@@ -54,6 +54,7 @@ export class TelemetryEventRelay extends EventRelay {
 			'source-control-user-finished-push-ui': (event) =>
 				this.sourceControlUserFinishedPushUi(event),
 			'license-renewal-attempted': (event) => this.licenseRenewalAttempted(event),
+			'license-community-plus-registered': (event) => this.licenseCommunityPlusRegistered(event),
 			'variable-created': () => this.variableCreated(),
 			'external-secrets-provider-settings-saved': (event) =>
 				this.externalSecretsProviderSettingsSaved(event),
@@ -234,6 +235,16 @@ export class TelemetryEventRelay extends EventRelay {
 		});
 	}
 
+	private licenseCommunityPlusRegistered({
+		email,
+		licenseKey,
+	}: RelayEventMap['license-community-plus-registered']) {
+		this.telemetry.track('User registered for license community plus', {
+			email,
+			licenseKey,
+		});
+	}
+
 	// #endregion
 
 	// #region Variable
diff --git a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
index 80e620fb17..c8e6b3e88f 100644
--- a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
@@ -9,7 +9,7 @@ import { ExecutionRepository } from '@/databases/repositories/execution.reposito
 import { saveExecutionProgress } from '@/execution-lifecycle-hooks/save-execution-progress';
 import * as fnModule from '@/execution-lifecycle-hooks/to-save-settings';
 import type { IExecutionResponse } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { mockInstance } from '@test/mocking';
 
 mockInstance(Logger);
diff --git a/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts b/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts
index 31b045ade8..d9a1a9a0e9 100644
--- a/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts
@@ -4,7 +4,7 @@ import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
 import Container from 'typedi';
 
 import config from '@/config';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 /**
  * Whenever the execution ID is not available to the binary data service at the
diff --git a/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts b/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
index 212990211f..ca9899e1ec 100644
--- a/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
@@ -4,7 +4,7 @@ import { Container } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { toSaveSettings } from '@/execution-lifecycle-hooks/to-save-settings';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 export async function saveExecutionProgress(
 	workflowData: IWorkflowBase,
diff --git a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts
index d6d55e63e5..68fd528f14 100644
--- a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts
@@ -1,10 +1,10 @@
 import pick from 'lodash/pick';
-import type { ExecutionStatus, IRun, IWorkflowBase } from 'n8n-workflow';
+import { ensureError, type ExecutionStatus, type IRun, type IWorkflowBase } from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import type { ExecutionPayload, IExecutionDb } from '@/interfaces';
-import { Logger } from '@/logger';
+import type { IExecutionDb, UpdateExecutionPayload } from '@/interfaces';
+import { Logger } from '@/logging/logger.service';
 import { ExecutionMetadataService } from '@/services/execution-metadata.service';
 import { isWorkflowIdValid } from '@/utils';
 
@@ -46,7 +46,7 @@ export function prepareExecutionDataForDbUpdate(parameters: {
 		'pinData',
 	]);
 
-	const fullExecutionData: ExecutionPayload = {
+	const fullExecutionData: UpdateExecutionPayload = {
 		data: runData.data,
 		mode: runData.mode,
 		finished: runData.finished ? runData.finished : false,
@@ -95,7 +95,8 @@ export async function updateExistingExecution(parameters: {
 			);
 		}
 	} catch (e) {
-		logger.error(`Failed to save metadata for execution ID ${executionId}`, e as Error);
+		const error = ensureError(e);
+		logger.error(`Failed to save metadata for execution ID ${executionId}`, { error });
 	}
 
 	if (executionData.finished === true && executionData.retryOf !== undefined) {
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index e1e6a1f180..33576d1368 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -10,7 +10,7 @@ import { NodeCrashedError } from '@/errors/node-crashed.error';
 import { WorkflowCrashedError } from '@/errors/workflow-crashed.error';
 import { EventService } from '@/events/event.service';
 import type { IExecutionResponse } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { Push } from '@/push';
 import { getWorkflowHooksMain } from '@/workflow-execute-additional-data'; // @TODO: Dependency cycle
 
diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
index a04c10e45f..5f4ec0c535 100644
--- a/packages/cli/src/executions/execution.service.ts
+++ b/packages/cli/src/executions/execution.service.ts
@@ -21,7 +21,7 @@ import { ActiveExecutions } from '@/active-executions';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
 import config from '@/config';
 import type { User } from '@/databases/entities/user';
-import { AnnotationTagMappingRepository } from '@/databases/repositories/annotation-tag-mapping.repository';
+import { AnnotationTagMappingRepository } from '@/databases/repositories/annotation-tag-mapping.repository.ee';
 import { ExecutionAnnotationRepository } from '@/databases/repositories/execution-annotation.repository';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type { IGetExecutionsQueryFilter } from '@/databases/repositories/execution.repository';
@@ -32,13 +32,13 @@ import { QueuedExecutionRetryError } from '@/errors/queued-execution-retry.error
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import type {
-	ExecutionPayload,
+	CreateExecutionPayload,
 	IExecutionFlattedResponse,
 	IExecutionResponse,
 	IWorkflowDb,
 } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import { WaitTracker } from '@/wait-tracker';
 import { WorkflowRunner } from '@/workflow-runner';
@@ -321,11 +321,10 @@ export class ExecutionService {
 			},
 		};
 
-		const fullExecutionData: ExecutionPayload = {
+		const fullExecutionData: CreateExecutionPayload = {
 			data: executionData,
 			mode,
 			finished: false,
-			startedAt: new Date(),
 			workflowData,
 			workflowId: workflow.id,
 			stoppedAt: new Date(),
diff --git a/packages/cli/src/executions/execution.types.ts b/packages/cli/src/executions/execution.types.ts
index ba574199a0..04d68d8197 100644
--- a/packages/cli/src/executions/execution.types.ts
+++ b/packages/cli/src/executions/execution.types.ts
@@ -80,6 +80,7 @@ export namespace ExecutionSummaries {
 		startedBefore: string;
 		annotationTags: string[]; // tag IDs
 		vote: AnnotationVote;
+		projectId: string;
 	}>;
 
 	type AccessFields = {
diff --git a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts b/packages/cli/src/external-secrets/external-secrets-manager.ee.ts
index dd33132d37..e175f2969c 100644
--- a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts
+++ b/packages/cli/src/external-secrets/external-secrets-manager.ee.ts
@@ -10,7 +10,7 @@ import type {
 	SecretsProviderSettings,
 } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 
 import { EXTERNAL_SECRETS_INITIAL_BACKOFF, EXTERNAL_SECRETS_MAX_BACKOFF } from './constants';
@@ -79,7 +79,7 @@ export class ExternalSecretsManager {
 	}
 
 	async broadcastReloadExternalSecretsProviders() {
-		await Container.get(OrchestrationService).publish('reloadExternalSecretsProviders');
+		await Container.get(OrchestrationService).publish('reload-external-secrets-providers');
 	}
 
 	private decryptSecretsSettings(value: string): ExternalSecretsSettings {
diff --git a/packages/cli/src/external-secrets/providers/vault.ts b/packages/cli/src/external-secrets/providers/vault.ts
index e325e69935..398c40745d 100644
--- a/packages/cli/src/external-secrets/providers/vault.ts
+++ b/packages/cli/src/external-secrets/providers/vault.ts
@@ -5,7 +5,7 @@ import { Container } from 'typedi';
 
 import type { SecretsProviderSettings, SecretsProviderState } from '@/interfaces';
 import { SecretsProvider } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '../constants';
 import { preferGet } from '../external-secrets-helper.ee';
diff --git a/packages/cli/src/generic-helpers.ts b/packages/cli/src/generic-helpers.ts
index 47ef1a796b..e5978bb34a 100644
--- a/packages/cli/src/generic-helpers.ts
+++ b/packages/cli/src/generic-helpers.ts
@@ -1,6 +1,6 @@
 import { validate } from 'class-validator';
 
-import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
+import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { TagEntity } from '@/databases/entities/tag-entity';
 import type { User } from '@/databases/entities/user';
diff --git a/packages/cli/src/interfaces.ts b/packages/cli/src/interfaces.ts
index 629925e8dc..4d2cd9b2d9 100644
--- a/packages/cli/src/interfaces.ts
+++ b/packages/cli/src/interfaces.ts
@@ -22,11 +22,13 @@ import type {
 	INodeProperties,
 	IUserSettings,
 	IWorkflowExecutionDataProcess,
+	DeduplicationMode,
+	DeduplicationItemTypes,
 } from 'n8n-workflow';
 import type PCancelable from 'p-cancelable';
 
 import type { ActiveWorkflowManager } from '@/active-workflow-manager';
-import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
+import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
 import type { AuthProviderType } from '@/databases/entities/auth-identity';
 import type { SharedCredentials } from '@/databases/entities/shared-credentials';
 import type { TagEntity } from '@/databases/entities/tag-entity';
@@ -48,6 +50,20 @@ export interface ICredentialsOverwrite {
 	[key: string]: ICredentialDataDecryptedObject;
 }
 
+// ----------------------------------
+//               ProcessedData
+// ----------------------------------
+
+export interface IProcessedDataLatest {
+	mode: DeduplicationMode;
+	data: DeduplicationItemTypes;
+}
+
+export interface IProcessedDataEntries {
+	mode: DeduplicationMode;
+	data: DeduplicationItemTypes[];
+}
+
 // ----------------------------------
 //               tags
 // ----------------------------------
@@ -115,6 +131,7 @@ export type SaveExecutionDataType = 'all' | 'none';
 export interface IExecutionBase {
 	id: string;
 	mode: WorkflowExecuteMode;
+	createdAt: Date; // set by DB
 	startedAt: Date;
 	stoppedAt?: Date; // empty value means execution is still running
 	workflowId: string;
@@ -131,10 +148,11 @@ export interface IExecutionDb extends IExecutionBase {
 	workflowData: IWorkflowBase;
 }
 
-/**
- * Payload for creating or updating an execution.
- */
-export type ExecutionPayload = Omit<IExecutionDb, 'id'>;
+/** Payload for creating an execution. */
+export type CreateExecutionPayload = Omit<IExecutionDb, 'id' | 'createdAt' | 'startedAt'>;
+
+/** Payload for updating an execution. */
+export type UpdateExecutionPayload = Omit<IExecutionDb, 'id' | 'createdAt'>;
 
 export interface IExecutionResponse extends IExecutionBase {
 	id: string;
diff --git a/packages/cli/src/ldap/ldap.service.ee.ts b/packages/cli/src/ldap/ldap.service.ee.ts
index 84c79c7651..b552db6974 100644
--- a/packages/cli/src/ldap/ldap.service.ee.ts
+++ b/packages/cli/src/ldap/ldap.service.ee.ts
@@ -14,7 +14,7 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import {
 	getCurrentAuthenticationMethod,
 	isEmailCurrentAuthenticationMethod,
diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts
index 75a57efd2c..c6e8dfa19f 100644
--- a/packages/cli/src/license.ts
+++ b/packages/cli/src/license.ts
@@ -6,7 +6,7 @@ import Container, { Service } from 'typedi';
 import config from '@/config';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { OnShutdown } from '@/decorators/on-shutdown';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { LicenseMetricsService } from '@/metrics/license-metrics.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 
@@ -37,7 +37,9 @@ export class License {
 		private readonly orchestrationService: OrchestrationService,
 		private readonly settingsRepository: SettingsRepository,
 		private readonly licenseMetricsService: LicenseMetricsService,
-	) {}
+	) {
+		this.logger = this.logger.withScope('license');
+	}
 
 	/**
 	 * Whether this instance should renew the license - on init and periodically.
@@ -109,9 +111,9 @@ export class License {
 
 			await this.manager.initialize();
 			this.logger.debug('License initialized');
-		} catch (e: unknown) {
-			if (e instanceof Error) {
-				this.logger.error('Could not initialize license manager sdk', e);
+		} catch (error: unknown) {
+			if (error instanceof Error) {
+				this.logger.error('Could not initialize license manager sdk', { error });
 			}
 		}
 	}
@@ -146,7 +148,7 @@ export class License {
 				this.orchestrationService.isFollower
 			) {
 				this.logger.debug(
-					'[Multi-main setup] Instance is follower, skipping sending of "reloadLicense" command...',
+					'[Multi-main setup] Instance is follower, skipping sending of "reload-license" command...',
 				);
 				return;
 			}
@@ -160,7 +162,7 @@ export class License {
 
 		if (config.getEnv('executions.mode') === 'queue') {
 			const { Publisher } = await import('@/scaling/pubsub/publisher.service');
-			await Container.get(Publisher).publishCommand({ command: 'reloadLicense' });
+			await Container.get(Publisher).publishCommand({ command: 'reload-license' });
 		}
 
 		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
@@ -253,6 +255,10 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.AI_ASSISTANT);
 	}
 
+	isAskAiEnabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.ASK_AI);
+	}
+
 	isAdvancedExecutionFiltersEnabled() {
 		return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS);
 	}
diff --git a/packages/cli/src/license/__tests__/license.service.test.ts b/packages/cli/src/license/__tests__/license.service.test.ts
index 5fe4d6c692..77afe04a2c 100644
--- a/packages/cli/src/license/__tests__/license.service.test.ts
+++ b/packages/cli/src/license/__tests__/license.service.test.ts
@@ -1,4 +1,5 @@
 import type { TEntitlement } from '@n8n_io/license-sdk';
+import axios, { AxiosError } from 'axios';
 import { mock } from 'jest-mock-extended';
 
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -7,6 +8,8 @@ import type { EventService } from '@/events/event.service';
 import type { License } from '@/license';
 import { LicenseErrors, LicenseService } from '@/license/license.service';
 
+jest.mock('axios');
+
 describe('LicenseService', () => {
 	const license = mock<License>();
 	const workflowRepository = mock<WorkflowRepository>();
@@ -84,4 +87,37 @@ describe('LicenseService', () => {
 			});
 		});
 	});
+
+	describe('registerCommunityEdition', () => {
+		test('on success', async () => {
+			jest
+				.spyOn(axios, 'post')
+				.mockResolvedValueOnce({ data: { title: 'Title', text: 'Text', licenseKey: 'abc-123' } });
+			const data = await licenseService.registerCommunityEdition({
+				email: 'test@ema.il',
+				instanceId: '123',
+				instanceUrl: 'http://localhost',
+				licenseType: 'community-registered',
+			});
+
+			expect(data).toEqual({ title: 'Title', text: 'Text' });
+			expect(eventService.emit).toHaveBeenCalledWith('license-community-plus-registered', {
+				email: 'test@ema.il',
+				licenseKey: 'abc-123',
+			});
+		});
+
+		test('on failure', async () => {
+			jest.spyOn(axios, 'post').mockRejectedValueOnce(new AxiosError('Failed'));
+			await expect(
+				licenseService.registerCommunityEdition({
+					email: 'test@ema.il',
+					instanceId: '123',
+					instanceUrl: 'http://localhost',
+					licenseType: 'community-registered',
+				}),
+			).rejects.toThrowError('Failed');
+			expect(eventService.emit).not.toHaveBeenCalled();
+		});
+	});
 });
diff --git a/packages/cli/src/license/license.controller.ts b/packages/cli/src/license/license.controller.ts
index e1644046bb..db895ef4a0 100644
--- a/packages/cli/src/license/license.controller.ts
+++ b/packages/cli/src/license/license.controller.ts
@@ -1,14 +1,21 @@
+import { CommunityRegisteredRequestDto } from '@n8n/api-types';
 import type { AxiosError } from 'axios';
+import { InstanceSettings } from 'n8n-core';
 
-import { Get, Post, RestController, GlobalScope } from '@/decorators';
+import { Get, Post, RestController, GlobalScope, Body } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { AuthenticatedRequest, LicenseRequest } from '@/requests';
+import { AuthenticatedRequest, AuthlessRequest, LicenseRequest } from '@/requests';
+import { UrlService } from '@/services/url.service';
 
 import { LicenseService } from './license.service';
 
 @RestController('/license')
 export class LicenseController {
-	constructor(private readonly licenseService: LicenseService) {}
+	constructor(
+		private readonly licenseService: LicenseService,
+		private readonly instanceSettings: InstanceSettings,
+		private readonly urlService: UrlService,
+	) {}
 
 	@Get('/')
 	async getLicenseData() {
@@ -32,6 +39,20 @@ export class LicenseController {
 		}
 	}
 
+	@Post('/enterprise/community-registered')
+	async registerCommunityEdition(
+		_req: AuthlessRequest,
+		_res: Response,
+		@Body payload: CommunityRegisteredRequestDto,
+	) {
+		return await this.licenseService.registerCommunityEdition({
+			email: payload.email,
+			instanceId: this.instanceSettings.instanceId,
+			instanceUrl: this.urlService.getInstanceBaseUrl(),
+			licenseType: 'community-registered',
+		});
+	}
+
 	@Post('/activate')
 	@GlobalScope('license:manage')
 	async activateLicense(req: LicenseRequest.Activate) {
diff --git a/packages/cli/src/license/license.service.ts b/packages/cli/src/license/license.service.ts
index d92c181f8d..43f9961334 100644
--- a/packages/cli/src/license/license.service.ts
+++ b/packages/cli/src/license/license.service.ts
@@ -1,4 +1,5 @@
-import axios from 'axios';
+import axios, { AxiosError } from 'axios';
+import { ensureError } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
@@ -6,15 +7,14 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { UrlService } from '@/services/url.service';
 
 type LicenseError = Error & { errorId?: keyof typeof LicenseErrors };
 
 export const LicenseErrors = {
 	SCHEMA_VALIDATION: 'Activation key is in the wrong format',
-	RESERVATION_EXHAUSTED:
-		'Activation key has been used too many times. Please contact sales@n8n.io if you would like to extend it',
+	RESERVATION_EXHAUSTED: 'Activation key has been used too many times',
 	RESERVATION_EXPIRED: 'Activation key has expired',
 	NOT_FOUND: 'Activation key not found',
 	RESERVATION_CONFLICT: 'Activation key not found',
@@ -60,6 +60,43 @@ export class LicenseService {
 		});
 	}
 
+	async registerCommunityEdition({
+		email,
+		instanceId,
+		instanceUrl,
+		licenseType,
+	}: {
+		email: string;
+		instanceId: string;
+		instanceUrl: string;
+		licenseType: string;
+	}): Promise<{ title: string; text: string }> {
+		try {
+			const {
+				data: { licenseKey, ...rest },
+			} = await axios.post<{ title: string; text: string; licenseKey: string }>(
+				'https://enterprise.n8n.io/community-registered',
+				{
+					email,
+					instanceId,
+					instanceUrl,
+					licenseType,
+				},
+			);
+			this.eventService.emit('license-community-plus-registered', { email, licenseKey });
+			return rest;
+		} catch (e: unknown) {
+			if (e instanceof AxiosError) {
+				const error = e as AxiosError<{ message: string }>;
+				const errorMsg = error.response?.data?.message ?? e.message;
+				throw new BadRequestError('Failed to register community edition: ' + errorMsg);
+			} else {
+				this.logger.error('Failed to register community edition', { error: ensureError(e) });
+				throw new BadRequestError('Failed to register community edition');
+			}
+		}
+	}
+
 	getManagementJwt(): string {
 		return this.license.getManagementJwt();
 	}
diff --git a/packages/cli/src/load-nodes-and-credentials.ts b/packages/cli/src/load-nodes-and-credentials.ts
index e2daaa0e76..a5cff3764f 100644
--- a/packages/cli/src/load-nodes-and-credentials.ts
+++ b/packages/cli/src/load-nodes-and-credentials.ts
@@ -18,6 +18,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeHelpers, ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 import path from 'path';
+import picocolors from 'picocolors';
 import { Container, Service } from 'typedi';
 
 import {
@@ -27,7 +28,8 @@ import {
 	CLI_DIR,
 	inE2ETests,
 } from '@/constants';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
+import { isContainedWithin } from '@/utils/path-util';
 
 interface LoadedNodesAndCredentials {
 	nodes: INodeTypeData;
@@ -146,6 +148,7 @@ export class LoadNodesAndCredentials {
 					path.join(nodeModulesDir, packagePath),
 				);
 			} catch (error) {
+				this.logger.error((error as Error).message);
 				ErrorReporter.error(error);
 			}
 		}
@@ -153,14 +156,13 @@ export class LoadNodesAndCredentials {
 
 	resolveIcon(packageName: string, url: string): string | undefined {
 		const loader = this.loaders[packageName];
-		if (loader) {
-			const pathPrefix = `/icons/${packageName}/`;
-			const filePath = path.resolve(loader.directory, url.substring(pathPrefix.length));
-			if (!path.relative(loader.directory, filePath).includes('..')) {
-				return filePath;
-			}
+		if (!loader) {
+			return undefined;
 		}
-		return undefined;
+		const pathPrefix = `/icons/${packageName}/`;
+		const filePath = path.resolve(loader.directory, url.substring(pathPrefix.length));
+
+		return isContainedWithin(loader.directory, filePath) ? filePath : undefined;
 	}
 
 	getCustomDirectories(): string[] {
@@ -258,6 +260,13 @@ export class LoadNodesAndCredentials {
 		dir: string,
 	) {
 		const loader = new constructor(dir, this.excludeNodes, this.includeNodes);
+		if (loader instanceof PackageDirectoryLoader && loader.packageName in this.loaders) {
+			throw new ApplicationError(
+				picocolors.red(
+					`nodes package ${loader.packageName} is already loaded.\n Please delete this second copy at path ${dir}`,
+				),
+			);
+		}
 		await loader.loadAll();
 		this.loaders[loader.packageName] = loader;
 		return loader;
diff --git a/packages/cli/src/logger.ts b/packages/cli/src/logger.ts
deleted file mode 100644
index 7a24bdbf28..0000000000
--- a/packages/cli/src/logger.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import callsites from 'callsites';
-import { LoggerProxy, type IDataObject, LOG_LEVELS } from 'n8n-workflow';
-import { basename } from 'path';
-import { Service } from 'typedi';
-import { inspect } from 'util';
-import winston from 'winston';
-
-import config from '@/config';
-
-const noOp = () => {};
-
-@Service()
-export class Logger {
-	private logger: winston.Logger;
-
-	constructor() {
-		const level = config.getEnv('logs.level');
-
-		this.logger = winston.createLogger({
-			level,
-			silent: level === 'silent',
-		});
-
-		// Change all methods with higher log-level to no-op
-		for (const levelName of LOG_LEVELS) {
-			if (this.logger.levels[levelName] > this.logger.levels[level]) {
-				Object.defineProperty(this, levelName, { value: noOp });
-			}
-		}
-
-		const output = config
-			.getEnv('logs.output')
-			.split(',')
-			.map((line) => line.trim());
-
-		if (output.includes('console')) {
-			let format: winston.Logform.Format;
-			if (level === 'debug') {
-				format = winston.format.combine(
-					winston.format.metadata(),
-					winston.format.timestamp(),
-					winston.format.colorize({ all: true }),
-
-					winston.format.printf(({ level: logLevel, message, timestamp, metadata }) => {
-						return `${timestamp} | ${logLevel.padEnd(18)} | ${message}${
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-							Object.keys(metadata).length ? ` ${JSON.stringify(inspect(metadata))}` : ''
-						}`;
-					}),
-				);
-			} else {
-				format = winston.format.printf(({ message }: { message: string }) => message);
-			}
-
-			this.logger.add(
-				new winston.transports.Console({
-					format,
-				}),
-			);
-		}
-
-		if (output.includes('file')) {
-			const fileLogFormat = winston.format.combine(
-				winston.format.timestamp(),
-				winston.format.metadata(),
-				winston.format.json(),
-			);
-			this.logger.add(
-				new winston.transports.File({
-					filename: config.getEnv('logs.file.location'),
-					format: fileLogFormat,
-					maxsize: config.getEnv('logs.file.fileSizeMax') * 1048576, // config * 1mb
-					maxFiles: config.getEnv('logs.file.fileCountMax'),
-				}),
-			);
-		}
-
-		LoggerProxy.init(this);
-	}
-
-	private log(level: (typeof LOG_LEVELS)[number], message: string, meta: object = {}): void {
-		const callsite = callsites();
-		// We are using the third array element as the structure is as follows:
-		// [0]: this file
-		// [1]: Should be Logger
-		// [2]: Should point to the caller.
-		// Note: getting line number is useless because at this point
-		// We are in runtime, so it means we are looking at compiled js files
-		const logDetails = {} as IDataObject;
-		if (callsite[2] !== undefined) {
-			logDetails.file = basename(callsite[2].getFileName() || '');
-			const functionName = callsite[2].getFunctionName();
-			if (functionName) {
-				logDetails.function = functionName;
-			}
-		}
-		this.logger.log(level, message, { ...meta, ...logDetails });
-	}
-
-	// Convenience methods below
-
-	error(message: string, meta: object = {}): void {
-		this.log('error', message, meta);
-	}
-
-	warn(message: string, meta: object = {}): void {
-		this.log('warn', message, meta);
-	}
-
-	info(message: string, meta: object = {}): void {
-		this.log('info', message, meta);
-	}
-
-	debug(message: string, meta: object = {}): void {
-		this.log('debug', message, meta);
-	}
-}
diff --git a/packages/cli/src/logging/__tests__/logger.service.test.ts b/packages/cli/src/logging/__tests__/logger.service.test.ts
new file mode 100644
index 0000000000..d01a709639
--- /dev/null
+++ b/packages/cli/src/logging/__tests__/logger.service.test.ts
@@ -0,0 +1,152 @@
+import type { GlobalConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
+
+import { Logger } from '@/logging/logger.service';
+
+describe('Logger', () => {
+	describe('transports', () => {
+		test('if `console` selected, should set console transport', () => {
+			const globalConfig = mock<GlobalConfig>({
+				logging: {
+					level: 'info',
+					outputs: ['console'],
+					scopes: [],
+				},
+			});
+
+			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+
+			const { transports } = logger.getInternalLogger();
+
+			expect(transports).toHaveLength(1);
+
+			const [transport] = transports;
+
+			expect(transport.constructor.name).toBe('Console');
+		});
+
+		test('if `file` selected, should set file transport', () => {
+			const globalConfig = mock<GlobalConfig>({
+				logging: {
+					level: 'info',
+					outputs: ['file'],
+					scopes: [],
+					file: {
+						fileSizeMax: 100,
+						fileCountMax: 16,
+						location: 'logs/n8n.log',
+					},
+				},
+			});
+
+			const logger = new Logger(globalConfig, mock<InstanceSettings>({ n8nFolder: '/tmp' }));
+
+			const { transports } = logger.getInternalLogger();
+
+			expect(transports).toHaveLength(1);
+
+			const [transport] = transports;
+
+			expect(transport.constructor.name).toBe('File');
+		});
+	});
+
+	describe('levels', () => {
+		test('if `error` selected, should enable `error` level', () => {
+			const globalConfig = mock<GlobalConfig>({
+				logging: {
+					level: 'error',
+					outputs: ['console'],
+					scopes: [],
+				},
+			});
+
+			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+
+			const internalLogger = logger.getInternalLogger();
+
+			expect(internalLogger.isErrorEnabled()).toBe(true);
+			expect(internalLogger.isWarnEnabled()).toBe(false);
+			expect(internalLogger.isInfoEnabled()).toBe(false);
+			expect(internalLogger.isDebugEnabled()).toBe(false);
+		});
+
+		test('if `warn` selected, should enable `error` and `warn` levels', () => {
+			const globalConfig = mock<GlobalConfig>({
+				logging: {
+					level: 'warn',
+					outputs: ['console'],
+					scopes: [],
+				},
+			});
+
+			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+
+			const internalLogger = logger.getInternalLogger();
+
+			expect(internalLogger.isErrorEnabled()).toBe(true);
+			expect(internalLogger.isWarnEnabled()).toBe(true);
+			expect(internalLogger.isInfoEnabled()).toBe(false);
+			expect(internalLogger.isDebugEnabled()).toBe(false);
+		});
+
+		test('if `info` selected, should enable `error`, `warn`, and `info` levels', () => {
+			const globalConfig = mock<GlobalConfig>({
+				logging: {
+					level: 'info',
+					outputs: ['console'],
+					scopes: [],
+				},
+			});
+
+			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+
+			const internalLogger = logger.getInternalLogger();
+
+			expect(internalLogger.isErrorEnabled()).toBe(true);
+			expect(internalLogger.isWarnEnabled()).toBe(true);
+			expect(internalLogger.isInfoEnabled()).toBe(true);
+			expect(internalLogger.isDebugEnabled()).toBe(false);
+		});
+
+		test('if `debug` selected, should enable all levels', () => {
+			const globalConfig = mock<GlobalConfig>({
+				logging: {
+					level: 'debug',
+					outputs: ['console'],
+					scopes: [],
+				},
+			});
+
+			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+
+			const internalLogger = logger.getInternalLogger();
+
+			expect(internalLogger.isErrorEnabled()).toBe(true);
+			expect(internalLogger.isWarnEnabled()).toBe(true);
+			expect(internalLogger.isInfoEnabled()).toBe(true);
+			expect(internalLogger.isDebugEnabled()).toBe(true);
+		});
+
+		test('if `silent` selected, should disable all levels', () => {
+			const globalConfig = mock<GlobalConfig>({
+				logging: {
+					level: 'silent',
+					outputs: ['console'],
+					scopes: [],
+				},
+			});
+
+			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+
+			const internalLogger = logger.getInternalLogger();
+
+			expect(internalLogger.isErrorEnabled()).toBe(false);
+			expect(internalLogger.isWarnEnabled()).toBe(false);
+			expect(internalLogger.isInfoEnabled()).toBe(false);
+			expect(internalLogger.isDebugEnabled()).toBe(false);
+			expect(internalLogger.silent).toBe(true);
+		});
+	});
+});
diff --git a/packages/cli/src/logging/constants.ts b/packages/cli/src/logging/constants.ts
new file mode 100644
index 0000000000..107327694b
--- /dev/null
+++ b/packages/cli/src/logging/constants.ts
@@ -0,0 +1,3 @@
+export const noOp = () => {};
+
+export const LOG_LEVELS = ['error', 'warn', 'info', 'debug', 'silent'] as const;
diff --git a/packages/cli/src/logging/logger.service.ts b/packages/cli/src/logging/logger.service.ts
new file mode 100644
index 0000000000..8bdb9177de
--- /dev/null
+++ b/packages/cli/src/logging/logger.service.ts
@@ -0,0 +1,220 @@
+import type { LogScope } from '@n8n/config';
+import { GlobalConfig } from '@n8n/config';
+import callsites from 'callsites';
+import type { TransformableInfo } from 'logform';
+import { InstanceSettings } from 'n8n-core';
+import { LoggerProxy, LOG_LEVELS } from 'n8n-workflow';
+import path, { basename } from 'node:path';
+import pc from 'picocolors';
+import { Service } from 'typedi';
+import winston from 'winston';
+
+import { inDevelopment, inProduction } from '@/constants';
+import { isObjectLiteral } from '@/utils';
+
+import { noOp } from './constants';
+import type { LogLocationMetadata, LogLevel, LogMetadata } from './types';
+
+@Service()
+export class Logger {
+	private internalLogger: winston.Logger;
+
+	private readonly level: LogLevel;
+
+	private readonly scopes: Set<LogScope>;
+
+	private get isScopingEnabled() {
+		return this.scopes.size > 0;
+	}
+
+	constructor(
+		private readonly globalConfig: GlobalConfig,
+		private readonly instanceSettings: InstanceSettings,
+	) {
+		this.level = this.globalConfig.logging.level;
+
+		const isSilent = this.level === 'silent';
+
+		this.internalLogger = winston.createLogger({
+			level: this.level,
+			silent: isSilent,
+		});
+
+		if (!isSilent) {
+			this.setLevel();
+
+			const { outputs, scopes } = this.globalConfig.logging;
+
+			if (outputs.includes('console')) this.setConsoleTransport();
+			if (outputs.includes('file')) this.setFileTransport();
+
+			this.scopes = new Set(scopes);
+		}
+
+		LoggerProxy.init(this);
+	}
+
+	private setInternalLogger(internalLogger: winston.Logger) {
+		this.internalLogger = internalLogger;
+	}
+
+	withScope(scope: LogScope) {
+		const scopedLogger = new Logger(this.globalConfig, this.instanceSettings);
+		const childLogger = this.internalLogger.child({ scope });
+
+		scopedLogger.setInternalLogger(childLogger);
+
+		return scopedLogger;
+	}
+
+	private log(level: LogLevel, message: string, metadata: LogMetadata) {
+		const location: LogLocationMetadata = {};
+
+		const caller = callsites().at(2); // zeroth and first are this file, second is caller
+
+		if (caller !== undefined) {
+			location.file = basename(caller.getFileName() ?? '');
+			const fnName = caller.getFunctionName();
+			if (fnName) location.function = fnName;
+		}
+
+		this.internalLogger.log(level, message, { ...metadata, ...location });
+	}
+
+	private setLevel() {
+		const { levels } = this.internalLogger;
+
+		for (const logLevel of LOG_LEVELS) {
+			if (levels[logLevel] > levels[this.level]) {
+				// numerically higher (less severe) log levels become no-op
+				// to prevent overhead from `callsites` calls
+				Object.defineProperty(this, logLevel, { value: noOp });
+			}
+		}
+	}
+
+	private setConsoleTransport() {
+		const format =
+			this.level === 'debug' && inDevelopment
+				? this.debugDevConsoleFormat()
+				: this.level === 'debug' && inProduction
+					? this.debugProdConsoleFormat()
+					: winston.format.printf(({ message }: { message: string }) => message);
+
+		this.internalLogger.add(new winston.transports.Console({ format }));
+	}
+
+	private scopeFilter() {
+		return winston.format((info: TransformableInfo & { metadata: LogMetadata }) => {
+			const shouldIncludeScope = info.metadata.scope && this.scopes.has(info.metadata.scope);
+
+			if (this.isScopingEnabled && !shouldIncludeScope) return false;
+
+			return info;
+		})();
+	}
+
+	private debugDevConsoleFormat() {
+		return winston.format.combine(
+			winston.format.metadata(),
+			winston.format.timestamp({ format: () => this.devTsFormat() }),
+			winston.format.colorize({ all: true }),
+			this.scopeFilter(),
+			winston.format.printf(({ level: _level, message, timestamp, metadata: _metadata }) => {
+				const SEPARATOR = ' '.repeat(3);
+				const LOG_LEVEL_COLUMN_WIDTH = 15; // 5 columns + ANSI color codes
+				const level = _level.toLowerCase().padEnd(LOG_LEVEL_COLUMN_WIDTH, ' ');
+				const metadata = this.toPrintable(_metadata);
+				return [timestamp, level, message + ' ' + pc.dim(metadata)].join(SEPARATOR);
+			}),
+		);
+	}
+
+	private debugProdConsoleFormat() {
+		return winston.format.combine(
+			winston.format.metadata(),
+			winston.format.timestamp(),
+			this.scopeFilter(),
+			winston.format.printf(({ level, message, timestamp, metadata }) => {
+				const _metadata = this.toPrintable(metadata);
+				return `${timestamp} | ${level.padEnd(5)} | ${message}${_metadata ? ' ' + _metadata : ''}`;
+			}),
+		);
+	}
+
+	private devTsFormat() {
+		const now = new Date();
+		const pad = (num: number, digits: number = 2) => num.toString().padStart(digits, '0');
+		const hours = pad(now.getHours());
+		const minutes = pad(now.getMinutes());
+		const seconds = pad(now.getSeconds());
+		const milliseconds = pad(now.getMilliseconds(), 3);
+		return `${hours}:${minutes}:${seconds}.${milliseconds}`;
+	}
+
+	private toPrintable(metadata: unknown) {
+		if (isObjectLiteral(metadata) && Object.keys(metadata).length > 0) {
+			return inProduction
+				? JSON.stringify(metadata)
+				: JSON.stringify(metadata)
+						.replace(/{"/g, '{ "')
+						.replace(/,"/g, ', "')
+						.replace(/:/g, ': ')
+						.replace(/}/g, ' }'); // spacing for readability
+		}
+
+		return '';
+	}
+
+	private setFileTransport() {
+		const format = winston.format.combine(
+			winston.format.timestamp(),
+			winston.format.metadata(),
+			winston.format.json(),
+		);
+
+		const filename = path.join(
+			this.instanceSettings.n8nFolder,
+			this.globalConfig.logging.file.location,
+		);
+
+		const { fileSizeMax, fileCountMax } = this.globalConfig.logging.file;
+
+		this.internalLogger.add(
+			new winston.transports.File({
+				filename,
+				format,
+				maxsize: fileSizeMax * 1_048_576, // config * 1 MiB in bytes
+				maxFiles: fileCountMax,
+			}),
+		);
+	}
+
+	// #region Convenience methods
+
+	error(message: string, metadata: LogMetadata = {}) {
+		this.log('error', message, metadata);
+	}
+
+	warn(message: string, metadata: LogMetadata = {}) {
+		this.log('warn', message, metadata);
+	}
+
+	info(message: string, metadata: LogMetadata = {}) {
+		this.log('info', message, metadata);
+	}
+
+	debug(message: string, metadata: LogMetadata = {}) {
+		this.log('debug', message, metadata);
+	}
+
+	// #endregion
+
+	// #region For testing only
+
+	getInternalLogger() {
+		return this.internalLogger;
+	}
+
+	// #endregion
+}
diff --git a/packages/cli/src/logging/types.ts b/packages/cli/src/logging/types.ts
new file mode 100644
index 0000000000..b6022c0bf6
--- /dev/null
+++ b/packages/cli/src/logging/types.ts
@@ -0,0 +1,14 @@
+import type { LogScope } from '@n8n/config';
+
+import type { LOG_LEVELS } from './constants';
+
+export type LogLevel = (typeof LOG_LEVELS)[number];
+
+export type LogMetadata = {
+	[key: string]: unknown;
+	scope?: LogScope;
+	file?: string;
+	function?: string;
+};
+
+export type LogLocationMetadata = Pick<LogMetadata, 'file' | 'function'>;
diff --git a/packages/cli/src/posthog/__tests__/posthog.test.ts b/packages/cli/src/posthog/__tests__/posthog.test.ts
index f2869afcbf..5c8fe282bf 100644
--- a/packages/cli/src/posthog/__tests__/posthog.test.ts
+++ b/packages/cli/src/posthog/__tests__/posthog.test.ts
@@ -1,3 +1,5 @@
+import type { GlobalConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 import { PostHog } from 'posthog-node';
 
@@ -15,6 +17,8 @@ describe('PostHog', () => {
 
 	const instanceSettings = mockInstance(InstanceSettings, { instanceId });
 
+	const globalConfig = mock<GlobalConfig>({ logging: { level: 'debug' } });
+
 	beforeAll(() => {
 		config.set('diagnostics.config.posthog.apiKey', apiKey);
 		config.set('diagnostics.config.posthog.apiHost', apiHost);
@@ -26,7 +30,7 @@ describe('PostHog', () => {
 	});
 
 	it('inits PostHog correctly', async () => {
-		const ph = new PostHogClient(instanceSettings);
+		const ph = new PostHogClient(instanceSettings, globalConfig);
 		await ph.init();
 
 		expect(PostHog.prototype.constructor).toHaveBeenCalledWith(apiKey, { host: apiHost });
@@ -35,7 +39,7 @@ describe('PostHog', () => {
 	it('does not initialize or track if diagnostics are not enabled', async () => {
 		config.set('diagnostics.enabled', false);
 
-		const ph = new PostHogClient(instanceSettings);
+		const ph = new PostHogClient(instanceSettings, globalConfig);
 		await ph.init();
 
 		ph.track({
@@ -55,7 +59,7 @@ describe('PostHog', () => {
 			test: true,
 		};
 
-		const ph = new PostHogClient(instanceSettings);
+		const ph = new PostHogClient(instanceSettings, globalConfig);
 		await ph.init();
 
 		ph.track({
@@ -75,7 +79,7 @@ describe('PostHog', () => {
 
 	it('gets feature flags', async () => {
 		const createdAt = new Date();
-		const ph = new PostHogClient(instanceSettings);
+		const ph = new PostHogClient(instanceSettings, globalConfig);
 		await ph.init();
 
 		await ph.getFeatureFlags({
diff --git a/packages/cli/src/posthog/index.ts b/packages/cli/src/posthog/index.ts
index 08a501f0fc..8dec9755b3 100644
--- a/packages/cli/src/posthog/index.ts
+++ b/packages/cli/src/posthog/index.ts
@@ -1,3 +1,4 @@
+import { GlobalConfig } from '@n8n/config';
 import { InstanceSettings } from 'n8n-core';
 import type { FeatureFlags, ITelemetryTrackProperties } from 'n8n-workflow';
 import type { PostHog } from 'posthog-node';
@@ -10,7 +11,10 @@ import type { PublicUser } from '@/interfaces';
 export class PostHogClient {
 	private postHog?: PostHog;
 
-	constructor(private readonly instanceSettings: InstanceSettings) {}
+	constructor(
+		private readonly instanceSettings: InstanceSettings,
+		private readonly globalConfig: GlobalConfig,
+	) {}
 
 	async init() {
 		const enabled = config.getEnv('diagnostics.enabled');
@@ -23,7 +27,7 @@ export class PostHogClient {
 			host: config.getEnv('diagnostics.config.posthog.apiHost'),
 		});
 
-		const logLevel = config.getEnv('logs.level');
+		const logLevel = this.globalConfig.logging.level;
 		if (logLevel === 'debug') {
 			this.postHog.debug(true);
 		}
diff --git a/packages/cli/src/public-api/index.ts b/packages/cli/src/public-api/index.ts
index c240a3efa3..1264f57496 100644
--- a/packages/cli/src/public-api/index.ts
+++ b/packages/cli/src/public-api/index.ts
@@ -10,10 +10,10 @@ import { Container } from 'typedi';
 import validator from 'validator';
 import YAML from 'yamljs';
 
-import { UserRepository } from '@/databases/repositories/user.repository';
 import { EventService } from '@/events/event.service';
 import { License } from '@/license';
 import type { AuthenticatedRequest } from '@/requests';
+import { PublicApiKeyService } from '@/services/public-api-key.service';
 import { UrlService } from '@/services/url.service';
 
 async function createApiRouter(
@@ -90,10 +90,9 @@ async function createApiRouter(
 						_scopes: unknown,
 						schema: OpenAPIV3.ApiKeySecurityScheme,
 					): Promise<boolean> => {
-						const apiKey = req.headers[schema.name.toLowerCase()] as string;
-						const user = await Container.get(UserRepository).findOne({
-							where: { apiKey },
-						});
+						const providedApiKey = req.headers[schema.name.toLowerCase()] as string;
+
+						const user = await Container.get(PublicApiKeyService).getUserForApiKey(providedApiKey);
 
 						if (!user) return false;
 
diff --git a/packages/cli/src/public-api/types.ts b/packages/cli/src/public-api/types.ts
index b69acff8d9..e2d22eac2c 100644
--- a/packages/cli/src/public-api/types.ts
+++ b/packages/cli/src/public-api/types.ts
@@ -84,11 +84,7 @@ export declare namespace WorkflowRequest {
 	type Activate = Get;
 	type GetTags = Get;
 	type UpdateTags = AuthenticatedRequest<{ id: string }, {}, TagEntity[]>;
-	type Transfer = AuthenticatedRequest<
-		{ workflowId: string },
-		{},
-		{ destinationProjectId: string }
-	>;
+	type Transfer = AuthenticatedRequest<{ id: string }, {}, { destinationProjectId: string }>;
 }
 
 export declare namespace UserRequest {
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
index f46b177c61..b0956a15c1 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
@@ -73,11 +73,13 @@ export = {
 	transferWorkflow: [
 		projectScope('workflow:move', 'workflow'),
 		async (req: WorkflowRequest.Transfer, res: express.Response) => {
+			const { id: workflowId } = req.params;
+
 			const body = z.object({ destinationProjectId: z.string() }).parse(req.body);
 
 			await Container.get(EnterpriseWorkflowService).transferOne(
 				req.user,
-				req.params.workflowId,
+				workflowId,
 				body.destinationProjectId,
 			);
 
diff --git a/packages/cli/src/push/__tests__/websocket.push.test.ts b/packages/cli/src/push/__tests__/websocket.push.test.ts
index f62038c6b3..209f91b17e 100644
--- a/packages/cli/src/push/__tests__/websocket.push.test.ts
+++ b/packages/cli/src/push/__tests__/websocket.push.test.ts
@@ -4,7 +4,7 @@ import { Container } from 'typedi';
 import type WebSocket from 'ws';
 
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { WebSocketPush } from '@/push/websocket.push';
 import { mockInstance } from '@test/mocking';
 
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
index f3ae6606ed..24cafa8121 100644
--- a/packages/cli/src/push/abstract.push.ts
+++ b/packages/cli/src/push/abstract.push.ts
@@ -1,8 +1,9 @@
 import type { PushPayload, PushType } from '@n8n/api-types';
 import { assert, jsonStringify } from 'n8n-workflow';
+import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
-import type { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import type { OnPushMessage } from '@/push/types';
 import { TypedEmitter } from '@/typed-emitter';
 
@@ -16,6 +17,7 @@ export interface AbstractPushEvents {
  *
  * @emits message when a message is received from a client
  */
+@Service()
 export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPushEvents> {
 	protected connections: Record<string, Connection> = {};
 
@@ -23,9 +25,12 @@ export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPush
 
 	protected abstract close(connection: Connection): void;
 	protected abstract sendToOneConnection(connection: Connection, data: string): void;
+	protected abstract ping(connection: Connection): void;
 
 	constructor(protected readonly logger: Logger) {
 		super();
+		// Ping all connected clients every 60 seconds
+		setInterval(() => this.pingAll(), 60 * 1000);
 	}
 
 	protected add(pushRef: string, userId: User['id'], connection: Connection) {
@@ -75,6 +80,12 @@ export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPush
 		}
 	}
 
+	private pingAll() {
+		for (const pushRef in this.connections) {
+			this.ping(this.connections[pushRef]);
+		}
+	}
+
 	sendToAll<Type extends PushType>(type: Type, data: PushPayload<Type>) {
 		this.sendTo(type, data, Object.keys(this.connections));
 	}
diff --git a/packages/cli/src/push/sse.push.ts b/packages/cli/src/push/sse.push.ts
index 96af003b4b..04e39d6d79 100644
--- a/packages/cli/src/push/sse.push.ts
+++ b/packages/cli/src/push/sse.push.ts
@@ -1,8 +1,6 @@
 import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logger';
-import SSEChannel from 'sse-channel';
 
 import { AbstractPush } from './abstract.push';
 import type { PushRequest, PushResponse } from './types';
@@ -11,29 +9,41 @@ type Connection = { req: PushRequest; res: PushResponse };
 
 @Service()
 export class SSEPush extends AbstractPush<Connection> {
-	readonly channel = new SSEChannel();
-
-	readonly connections: Record<string, Connection> = {};
-
-	constructor(logger: Logger) {
-		super(logger);
-
-		this.channel.on('disconnect', (_, { req }) => {
-			this.remove(req?.query?.pushRef);
-		});
-	}
-
 	add(pushRef: string, userId: User['id'], connection: Connection) {
+		const { req, res } = connection;
+
+		// Initialize the connection
+		req.socket.setTimeout(0);
+		req.socket.setNoDelay(true);
+		req.socket.setKeepAlive(true);
+		res.setHeader('Content-Type', 'text/event-stream; charset=UTF-8');
+		res.setHeader('Cache-Control', 'no-cache');
+		res.setHeader('Connection', 'keep-alive');
+		res.writeHead(200);
+		res.write(':ok\n\n');
+		res.flush();
+
 		super.add(pushRef, userId, connection);
-		this.channel.addClient(connection.req, connection.res);
+
+		// When the client disconnects, remove the client
+		const removeClient = () => this.remove(pushRef);
+		req.once('end', removeClient);
+		req.once('close', removeClient);
+		res.once('finish', removeClient);
 	}
 
 	protected close({ res }: Connection) {
 		res.end();
-		this.channel.removeClient(res);
 	}
 
 	protected sendToOneConnection(connection: Connection, data: string) {
-		this.channel.send(data, [connection.res]);
+		const { res } = connection;
+		res.write('data: ' + data + '\n\n');
+		res.flush();
+	}
+
+	protected ping({ res }: Connection) {
+		res.write(':ping\n\n');
+		res.flush();
 	}
 }
diff --git a/packages/cli/src/push/types.ts b/packages/cli/src/push/types.ts
index db9121eecc..b0db44ba1a 100644
--- a/packages/cli/src/push/types.ts
+++ b/packages/cli/src/push/types.ts
@@ -11,7 +11,15 @@ export type PushRequest = AuthenticatedRequest<{}, {}, {}, { pushRef: string }>;
 export type SSEPushRequest = PushRequest & { ws: undefined };
 export type WebSocketPushRequest = PushRequest & { ws: WebSocket };
 
-export type PushResponse = Response & { req: PushRequest };
+export type PushResponse = Response & {
+	req: PushRequest;
+	/**
+	 * `flush()` is defined in the compression middleware.
+	 * This is necessary because the compression middleware sometimes waits
+	 * for a certain amount of data before sending the data to the client
+	 */
+	flush: () => void;
+};
 
 export interface OnPushMessage {
 	pushRef: string;
diff --git a/packages/cli/src/push/websocket.push.ts b/packages/cli/src/push/websocket.push.ts
index 013663cab6..a2ea39c500 100644
--- a/packages/cli/src/push/websocket.push.ts
+++ b/packages/cli/src/push/websocket.push.ts
@@ -3,7 +3,6 @@ import { Service } from 'typedi';
 import type WebSocket from 'ws';
 
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logger';
 
 import { AbstractPush } from './abstract.push';
 
@@ -13,13 +12,6 @@ function heartbeat(this: WebSocket) {
 
 @Service()
 export class WebSocketPush extends AbstractPush<WebSocket> {
-	constructor(logger: Logger) {
-		super(logger);
-
-		// Ping all connected clients every 60 seconds
-		setInterval(() => this.pingAll(), 60 * 1000);
-	}
-
 	add(pushRef: string, userId: User['id'], connection: WebSocket) {
 		connection.isAlive = true;
 		connection.on('pong', heartbeat);
@@ -67,17 +59,12 @@ export class WebSocketPush extends AbstractPush<WebSocket> {
 		connection.send(data);
 	}
 
-	private pingAll() {
-		for (const pushRef in this.connections) {
-			const connection = this.connections[pushRef];
-			// If a connection did not respond with a `PONG` in the last 60 seconds, disconnect
-			if (!connection.isAlive) {
-				delete this.connections[pushRef];
-				return connection.terminate();
-			}
-
-			connection.isAlive = false;
-			connection.ping();
+	protected ping(connection: WebSocket): void {
+		// If a connection did not respond with a `PONG` in the last 60 seconds, disconnect
+		if (!connection.isAlive) {
+			return connection.terminate();
 		}
+		connection.isAlive = false;
+		connection.ping();
 	}
 }
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 5afe97f31a..e25a244f5f 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -180,6 +180,14 @@ export declare namespace CredentialRequest {
 	>;
 }
 
+// ----------------------------------
+//               /api-keys
+// ----------------------------------
+
+export declare namespace ApiKeysRequest {
+	export type DeleteAPIKey = AuthenticatedRequest<{ id: string }>;
+}
+
 // ----------------------------------
 //               /me
 // ----------------------------------
@@ -578,5 +586,6 @@ export declare namespace AiAssistantRequest {
 	type Chat = AuthenticatedRequest<{}, {}, AiAssistantSDK.ChatRequestPayload>;
 
 	type SuggestionPayload = { sessionId: string; suggestionId: string };
-	type ApplySuggestion = AuthenticatedRequest<{}, {}, SuggestionPayload>;
+	type ApplySuggestionPayload = AuthenticatedRequest<{}, {}, SuggestionPayload>;
+	type AskAiPayload = AuthenticatedRequest<{}, {}, AiAssistantSDK.AskAiRequestPayload>;
 }
diff --git a/packages/cli/src/response-helper.ts b/packages/cli/src/response-helper.ts
index c9f7270d5f..0dff1625cb 100644
--- a/packages/cli/src/response-helper.ts
+++ b/packages/cli/src/response-helper.ts
@@ -10,9 +10,9 @@ import picocolors from 'picocolors';
 import Container from 'typedi';
 
 import { inDevelopment } from '@/constants';
+import { Logger } from '@/logging/logger.service';
 
 import { ResponseError } from './errors/response-errors/abstract/response.error';
-import { Logger } from './logger';
 
 export function sendSuccessResponse(
 	res: Response,
diff --git a/packages/cli/src/runners/__tests__/task-broker.test.ts b/packages/cli/src/runners/__tests__/task-broker.test.ts
new file mode 100644
index 0000000000..f5b91a3f2c
--- /dev/null
+++ b/packages/cli/src/runners/__tests__/task-broker.test.ts
@@ -0,0 +1,504 @@
+import { mock } from 'jest-mock-extended';
+
+import { TaskRejectError } from '../errors';
+import type { RunnerMessage, TaskResultData } from '../runner-types';
+import { TaskBroker } from '../task-broker.service';
+import type { TaskOffer, TaskRequest, TaskRunner } from '../task-broker.service';
+
+describe('TaskBroker', () => {
+	let taskBroker: TaskBroker;
+
+	beforeEach(() => {
+		taskBroker = new TaskBroker(mock());
+		jest.restoreAllMocks();
+	});
+
+	describe('expireTasks', () => {
+		it('should remove expired task offers and keep valid task offers', () => {
+			const now = process.hrtime.bigint();
+
+			const validOffer: TaskOffer = {
+				offerId: 'valid',
+				runnerId: 'runner1',
+				taskType: 'taskType1',
+				validFor: 1000,
+				validUntil: now + BigInt(1000 * 1_000_000), // 1 second in the future
+			};
+
+			const expiredOffer1: TaskOffer = {
+				offerId: 'expired1',
+				runnerId: 'runner2',
+				taskType: 'taskType1',
+				validFor: 1000,
+				validUntil: now - BigInt(1000 * 1_000_000), // 1 second in the past
+			};
+
+			const expiredOffer2: TaskOffer = {
+				offerId: 'expired2',
+				runnerId: 'runner3',
+				taskType: 'taskType1',
+				validFor: 2000,
+				validUntil: now - BigInt(2000 * 1_000_000), // 2 seconds in the past
+			};
+
+			taskBroker.setPendingTaskOffers([validOffer, expiredOffer1, expiredOffer2]);
+
+			taskBroker.expireTasks();
+
+			const offers = taskBroker.getPendingTaskOffers();
+
+			expect(offers).toHaveLength(1);
+			expect(offers[0]).toEqual(validOffer);
+		});
+	});
+
+	describe('registerRunner', () => {
+		it('should add a runner to known runners', () => {
+			const runnerId = 'runner1';
+			const runner = mock<TaskRunner>({ id: runnerId });
+			const messageCallback = jest.fn();
+
+			taskBroker.registerRunner(runner, messageCallback);
+
+			const knownRunners = taskBroker.getKnownRunners();
+			const runnerIds = [...knownRunners.keys()];
+
+			expect(runnerIds).toHaveLength(1);
+			expect(runnerIds[0]).toEqual(runnerId);
+
+			expect(knownRunners.get(runnerId)?.runner).toEqual(runner);
+			expect(knownRunners.get(runnerId)?.messageCallback).toEqual(messageCallback);
+		});
+	});
+
+	describe('registerRequester', () => {
+		it('should add a requester to known requesters', () => {
+			const requesterId = 'requester1';
+			const messageCallback = jest.fn();
+
+			taskBroker.registerRequester(requesterId, messageCallback);
+
+			const knownRequesters = taskBroker.getKnownRequesters();
+			const requesterIds = [...knownRequesters.keys()];
+
+			expect(requesterIds).toHaveLength(1);
+			expect(requesterIds[0]).toEqual(requesterId);
+
+			expect(knownRequesters.get(requesterId)).toEqual(messageCallback);
+		});
+	});
+
+	describe('deregisterRunner', () => {
+		it('should remove a runner from known runners', () => {
+			const runnerId = 'runner1';
+			const runner = mock<TaskRunner>({ id: runnerId });
+			const messageCallback = jest.fn();
+
+			taskBroker.registerRunner(runner, messageCallback);
+			taskBroker.deregisterRunner(runnerId);
+
+			const knownRunners = taskBroker.getKnownRunners();
+			const runnerIds = Object.keys(knownRunners);
+
+			expect(runnerIds).toHaveLength(0);
+		});
+	});
+
+	describe('deregisterRequester', () => {
+		it('should remove a requester from known requesters', () => {
+			const requesterId = 'requester1';
+			const messageCallback = jest.fn();
+
+			taskBroker.registerRequester(requesterId, messageCallback);
+			taskBroker.deregisterRequester(requesterId);
+
+			const knownRequesters = taskBroker.getKnownRequesters();
+			const requesterIds = Object.keys(knownRequesters);
+
+			expect(requesterIds).toHaveLength(0);
+		});
+	});
+
+	describe('taskRequested', () => {
+		it('should match a pending offer to an incoming request', async () => {
+			const now = process.hrtime.bigint();
+
+			const offer: TaskOffer = {
+				offerId: 'offer1',
+				runnerId: 'runner1',
+				taskType: 'taskType1',
+				validFor: 1000,
+				validUntil: now + BigInt(1000 * 1_000_000),
+			};
+
+			taskBroker.setPendingTaskOffers([offer]);
+
+			const request: TaskRequest = {
+				requestId: 'request1',
+				requesterId: 'requester1',
+				taskType: 'taskType1',
+			};
+
+			jest.spyOn(taskBroker, 'acceptOffer').mockResolvedValue(); // allow Jest to exit cleanly
+
+			taskBroker.taskRequested(request);
+
+			expect(taskBroker.acceptOffer).toHaveBeenCalled();
+			expect(taskBroker.getPendingTaskOffers()).toHaveLength(0);
+		});
+	});
+
+	describe('taskOffered', () => {
+		it('should match a pending request to an incoming offer', () => {
+			const now = process.hrtime.bigint();
+
+			const request: TaskRequest = {
+				requestId: 'request1',
+				requesterId: 'requester1',
+				taskType: 'taskType1',
+				acceptInProgress: false,
+			};
+
+			taskBroker.setPendingTaskRequests([request]);
+
+			const offer: TaskOffer = {
+				offerId: 'offer1',
+				runnerId: 'runner1',
+				taskType: 'taskType1',
+				validFor: 1000,
+				validUntil: now + BigInt(1000 * 1_000_000),
+			};
+
+			jest.spyOn(taskBroker, 'acceptOffer').mockResolvedValue(); // allow Jest to exit cleanly
+
+			taskBroker.taskOffered(offer);
+
+			expect(taskBroker.acceptOffer).toHaveBeenCalled();
+			expect(taskBroker.getPendingTaskOffers()).toHaveLength(0);
+		});
+	});
+
+	describe('settleTasks', () => {
+		it('should match task offers with task requests by task type', () => {
+			const now = process.hrtime.bigint();
+
+			const offer1: TaskOffer = {
+				offerId: 'offer1',
+				runnerId: 'runner1',
+				taskType: 'taskType1',
+				validFor: 1000,
+				validUntil: now + BigInt(1000 * 1_000_000),
+			};
+
+			const offer2: TaskOffer = {
+				offerId: 'offer2',
+				runnerId: 'runner2',
+				taskType: 'taskType2',
+				validFor: 1000,
+				validUntil: now + BigInt(1000 * 1_000_000),
+			};
+
+			const request1: TaskRequest = {
+				requestId: 'request1',
+				requesterId: 'requester1',
+				taskType: 'taskType1',
+				acceptInProgress: false,
+			};
+
+			const request2: TaskRequest = {
+				requestId: 'request2',
+				requesterId: 'requester2',
+				taskType: 'taskType2',
+				acceptInProgress: false,
+			};
+
+			const request3: TaskRequest = {
+				requestId: 'request3',
+				requesterId: 'requester3',
+				taskType: 'taskType3', // will have no match
+				acceptInProgress: false,
+			};
+
+			taskBroker.setPendingTaskOffers([offer1, offer2]);
+			taskBroker.setPendingTaskRequests([request1, request2, request3]);
+
+			const acceptOfferSpy = jest.spyOn(taskBroker, 'acceptOffer').mockResolvedValue();
+
+			taskBroker.settleTasks();
+
+			expect(acceptOfferSpy).toHaveBeenCalledTimes(2);
+			expect(acceptOfferSpy).toHaveBeenCalledWith(offer1, request1);
+			expect(acceptOfferSpy).toHaveBeenCalledWith(offer2, request2);
+
+			const remainingOffers = taskBroker.getPendingTaskOffers();
+			expect(remainingOffers).toHaveLength(0);
+		});
+
+		it('should not match a request whose acceptance is in progress', () => {
+			const now = process.hrtime.bigint();
+
+			const offer: TaskOffer = {
+				offerId: 'offer1',
+				runnerId: 'runner1',
+				taskType: 'taskType1',
+				validFor: 1000,
+				validUntil: now + BigInt(1000 * 1_000_000),
+			};
+
+			const request: TaskRequest = {
+				requestId: 'request1',
+				requesterId: 'requester1',
+				taskType: 'taskType1',
+				acceptInProgress: true,
+			};
+
+			taskBroker.setPendingTaskOffers([offer]);
+			taskBroker.setPendingTaskRequests([request]);
+
+			const acceptOfferSpy = jest.spyOn(taskBroker, 'acceptOffer').mockResolvedValue();
+
+			taskBroker.settleTasks();
+
+			expect(acceptOfferSpy).not.toHaveBeenCalled();
+
+			const remainingOffers = taskBroker.getPendingTaskOffers();
+			expect(remainingOffers).toHaveLength(1);
+			expect(remainingOffers[0]).toEqual(offer);
+
+			const remainingRequests = taskBroker.getPendingTaskRequests();
+			expect(remainingRequests).toHaveLength(1);
+			expect(remainingRequests[0]).toEqual(request);
+		});
+
+		it('should expire tasks before settling', () => {
+			const now = process.hrtime.bigint();
+
+			const validOffer: TaskOffer = {
+				offerId: 'valid',
+				runnerId: 'runner1',
+				taskType: 'taskType1',
+				validFor: 1000,
+				validUntil: now + BigInt(1000 * 1_000_000), // 1 second in the future
+			};
+
+			const expiredOffer: TaskOffer = {
+				offerId: 'expired',
+				runnerId: 'runner2',
+				taskType: 'taskType2', // will be removed before matching
+				validFor: 1000,
+				validUntil: now - BigInt(1000 * 1_000_000), // 1 second in the past
+			};
+
+			const request1: TaskRequest = {
+				requestId: 'request1',
+				requesterId: 'requester1',
+				taskType: 'taskType1',
+				acceptInProgress: false,
+			};
+
+			const request2: TaskRequest = {
+				requestId: 'request2',
+				requesterId: 'requester2',
+				taskType: 'taskType2',
+				acceptInProgress: false,
+			};
+
+			taskBroker.setPendingTaskOffers([validOffer, expiredOffer]);
+			taskBroker.setPendingTaskRequests([request1, request2]);
+
+			const acceptOfferSpy = jest.spyOn(taskBroker, 'acceptOffer').mockResolvedValue();
+
+			taskBroker.settleTasks();
+
+			expect(acceptOfferSpy).toHaveBeenCalledTimes(1);
+			expect(acceptOfferSpy).toHaveBeenCalledWith(validOffer, request1);
+
+			const remainingOffers = taskBroker.getPendingTaskOffers();
+			expect(remainingOffers).toHaveLength(0);
+		});
+	});
+
+	describe('onRunnerMessage', () => {
+		it('should handle `runner:taskaccepted` message', async () => {
+			const runnerId = 'runner1';
+			const taskId = 'task1';
+
+			const message: RunnerMessage.ToN8n.TaskAccepted = {
+				type: 'runner:taskaccepted',
+				taskId,
+			};
+
+			const accept = jest.fn();
+			const reject = jest.fn();
+
+			taskBroker.setRunnerAcceptRejects({ [taskId]: { accept, reject } });
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			const runnerAcceptRejects = taskBroker.getRunnerAcceptRejects();
+
+			expect(accept).toHaveBeenCalled();
+			expect(reject).not.toHaveBeenCalled();
+			expect(runnerAcceptRejects.get(taskId)).toBeUndefined();
+		});
+
+		it('should handle `runner:taskrejected` message', async () => {
+			const runnerId = 'runner1';
+			const taskId = 'task1';
+			const rejectionReason = 'Task execution failed';
+
+			const message: RunnerMessage.ToN8n.TaskRejected = {
+				type: 'runner:taskrejected',
+				taskId,
+				reason: rejectionReason,
+			};
+
+			const accept = jest.fn();
+			const reject = jest.fn();
+
+			taskBroker.setRunnerAcceptRejects({ [taskId]: { accept, reject } });
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			const runnerAcceptRejects = taskBroker.getRunnerAcceptRejects();
+
+			expect(accept).not.toHaveBeenCalled();
+			expect(reject).toHaveBeenCalledWith(new TaskRejectError(rejectionReason));
+			expect(runnerAcceptRejects.get(taskId)).toBeUndefined();
+		});
+
+		it('should handle `runner:taskdone` message', async () => {
+			const runnerId = 'runner1';
+			const taskId = 'task1';
+			const requesterId = 'requester1';
+			const data = mock<TaskResultData>();
+
+			const message: RunnerMessage.ToN8n.TaskDone = {
+				type: 'runner:taskdone',
+				taskId,
+				data,
+			};
+
+			const requesterMessageCallback = jest.fn();
+
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+			taskBroker.registerRequester(requesterId, requesterMessageCallback);
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			expect(requesterMessageCallback).toHaveBeenCalledWith({
+				type: 'broker:taskdone',
+				taskId,
+				data,
+			});
+
+			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
+		});
+
+		it('should handle `runner:taskerror` message', async () => {
+			const runnerId = 'runner1';
+			const taskId = 'task1';
+			const requesterId = 'requester1';
+			const errorMessage = 'Task execution failed';
+
+			const message: RunnerMessage.ToN8n.TaskError = {
+				type: 'runner:taskerror',
+				taskId,
+				error: errorMessage,
+			};
+
+			const requesterMessageCallback = jest.fn();
+
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+			taskBroker.registerRequester(requesterId, requesterMessageCallback);
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			expect(requesterMessageCallback).toHaveBeenCalledWith({
+				type: 'broker:taskerror',
+				taskId,
+				error: errorMessage,
+			});
+
+			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
+		});
+
+		it('should handle `runner:taskdatarequest` message', async () => {
+			const runnerId = 'runner1';
+			const taskId = 'task1';
+			const requesterId = 'requester1';
+			const requestId = 'request1';
+			const requestType = 'input';
+			const param = 'test_param';
+
+			const message: RunnerMessage.ToN8n.TaskDataRequest = {
+				type: 'runner:taskdatarequest',
+				taskId,
+				requestId,
+				requestType,
+				param,
+			};
+
+			const requesterMessageCallback = jest.fn();
+
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+			taskBroker.registerRequester(requesterId, requesterMessageCallback);
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			expect(requesterMessageCallback).toHaveBeenCalledWith({
+				type: 'broker:taskdatarequest',
+				taskId,
+				requestId,
+				requestType,
+				param,
+			});
+		});
+
+		it('should handle `runner:rpc` message', async () => {
+			const runnerId = 'runner1';
+			const taskId = 'task1';
+			const requesterId = 'requester1';
+			const callId = 'call1';
+			const rpcName = 'helpers.httpRequestWithAuthentication';
+			const rpcParams = ['param1', 'param2'];
+
+			const message: RunnerMessage.ToN8n.RPC = {
+				type: 'runner:rpc',
+				taskId,
+				callId,
+				name: rpcName,
+				params: rpcParams,
+			};
+
+			const requesterMessageCallback = jest.fn();
+
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+			taskBroker.registerRequester(requesterId, requesterMessageCallback);
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			expect(requesterMessageCallback).toHaveBeenCalledWith({
+				type: 'broker:rpc',
+				taskId,
+				callId,
+				name: rpcName,
+				params: rpcParams,
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/runners/__tests__/task-runner-process.test.ts b/packages/cli/src/runners/__tests__/task-runner-process.test.ts
new file mode 100644
index 0000000000..b2ad678ee1
--- /dev/null
+++ b/packages/cli/src/runners/__tests__/task-runner-process.test.ts
@@ -0,0 +1,48 @@
+import { GlobalConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+import type { ChildProcess, SpawnOptions } from 'node:child_process';
+
+import { mockInstance } from '../../../test/shared/mocking';
+import type { TaskRunnerAuthService } from '../auth/task-runner-auth.service';
+import { TaskRunnerProcess } from '../task-runner-process';
+
+const spawnMock = jest.fn(() =>
+	mock<ChildProcess>({
+		stdout: {
+			pipe: jest.fn(),
+		},
+		stderr: {
+			pipe: jest.fn(),
+		},
+	}),
+);
+require('child_process').spawn = spawnMock;
+
+describe('TaskRunnerProcess', () => {
+	const globalConfig = mockInstance(GlobalConfig);
+	const authService = mock<TaskRunnerAuthService>();
+	const taskRunnerProcess = new TaskRunnerProcess(globalConfig, authService);
+
+	afterEach(async () => {
+		spawnMock.mockClear();
+	});
+
+	describe('start', () => {
+		it('should propagate NODE_FUNCTION_ALLOW_BUILTIN and NODE_FUNCTION_ALLOW_EXTERNAL from env', async () => {
+			jest.spyOn(authService, 'createGrantToken').mockResolvedValue('grantToken');
+			process.env.NODE_FUNCTION_ALLOW_BUILTIN = '*';
+			process.env.NODE_FUNCTION_ALLOW_EXTERNAL = '*';
+
+			await taskRunnerProcess.start();
+
+			// @ts-expect-error The type is not correct
+			const options = spawnMock.mock.calls[0][2] as SpawnOptions;
+			expect(options.env).toEqual(
+				expect.objectContaining({
+					NODE_FUNCTION_ALLOW_BUILTIN: '*',
+					NODE_FUNCTION_ALLOW_EXTERNAL: '*',
+				}),
+			);
+		});
+	});
+});
diff --git a/packages/cli/src/runners/auth/__tests__/task-runner-auth.controller.test.ts b/packages/cli/src/runners/auth/__tests__/task-runner-auth.controller.test.ts
new file mode 100644
index 0000000000..7d43f91458
--- /dev/null
+++ b/packages/cli/src/runners/auth/__tests__/task-runner-auth.controller.test.ts
@@ -0,0 +1,115 @@
+import { GlobalConfig } from '@n8n/config';
+import type { NextFunction, Response } from 'express';
+import { mock } from 'jest-mock-extended';
+
+import { CacheService } from '@/services/cache/cache.service';
+import { mockInstance } from '@test/mocking';
+
+import { BadRequestError } from '../../../errors/response-errors/bad-request.error';
+import { ForbiddenError } from '../../../errors/response-errors/forbidden.error';
+import type { AuthlessRequest } from '../../../requests';
+import type { TaskRunnerServerInitRequest } from '../../runner-types';
+import { TaskRunnerAuthController } from '../task-runner-auth.controller';
+import { TaskRunnerAuthService } from '../task-runner-auth.service';
+
+describe('TaskRunnerAuthController', () => {
+	const globalConfig = mockInstance(GlobalConfig, {
+		cache: {
+			backend: 'memory',
+			memory: {
+				maxSize: 1024,
+				ttl: 9999,
+			},
+		},
+		taskRunners: {
+			authToken: 'random-secret',
+		},
+	});
+	const TTL = 100;
+	const cacheService = new CacheService(globalConfig);
+	const authService = new TaskRunnerAuthService(globalConfig, cacheService, TTL);
+	const authController = new TaskRunnerAuthController(authService);
+
+	const createMockGrantTokenReq = (token?: string) =>
+		({
+			body: {
+				token,
+			},
+		}) as unknown as AuthlessRequest;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('createGrantToken', () => {
+		it('should throw BadRequestError when auth token is missing', async () => {
+			const req = createMockGrantTokenReq();
+
+			// Act
+			await expect(authController.createGrantToken(req)).rejects.toThrowError(BadRequestError);
+		});
+
+		it('should throw ForbiddenError when auth token is invalid', async () => {
+			const req = createMockGrantTokenReq('invalid');
+
+			// Act
+			await expect(authController.createGrantToken(req)).rejects.toThrowError(ForbiddenError);
+		});
+
+		it('should return rant token when auth token is valid', async () => {
+			const req = createMockGrantTokenReq('random-secret');
+
+			// Act
+			await expect(authController.createGrantToken(req)).resolves.toStrictEqual({
+				token: expect.any(String),
+			});
+		});
+	});
+
+	describe('authMiddleware', () => {
+		const res = mock<Response>();
+		const next = jest.fn() as NextFunction;
+
+		const createMockReqWithToken = (token?: string) =>
+			mock<TaskRunnerServerInitRequest>({
+				headers: {
+					authorization: `Bearer ${token}`,
+				},
+			});
+
+		beforeEach(() => {
+			res.status.mockReturnThis();
+		});
+
+		it('should respond with 401 when grant token is missing', async () => {
+			const req = mock<TaskRunnerServerInitRequest>({});
+
+			await authController.authMiddleware(req, res, next);
+
+			expect(next).not.toHaveBeenCalled();
+			expect(res.status).toHaveBeenCalledWith(401);
+			expect(res.json).toHaveBeenCalledWith({ code: 401, message: 'Unauthorized' });
+		});
+
+		it('should respond with 403 when grant token is invalid', async () => {
+			const req = createMockReqWithToken('invalid');
+
+			await authController.authMiddleware(req, res, next);
+
+			expect(next).not.toHaveBeenCalled();
+			expect(res.status).toHaveBeenCalledWith(403);
+			expect(res.json).toHaveBeenCalledWith({ code: 403, message: 'Forbidden' });
+		});
+
+		it('should call next() when grant token is valid', async () => {
+			const { token: validToken } = await authController.createGrantToken(
+				createMockGrantTokenReq('random-secret'),
+			);
+
+			await authController.authMiddleware(createMockReqWithToken(validToken), res, next);
+
+			expect(next).toHaveBeenCalled();
+			expect(res.status).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/cli/src/runners/auth/__tests__/task-runner-auth.service.test.ts b/packages/cli/src/runners/auth/__tests__/task-runner-auth.service.test.ts
new file mode 100644
index 0000000000..a1321945e3
--- /dev/null
+++ b/packages/cli/src/runners/auth/__tests__/task-runner-auth.service.test.ts
@@ -0,0 +1,95 @@
+import { GlobalConfig } from '@n8n/config';
+import { sleep } from 'n8n-workflow';
+
+import config from '@/config';
+import { CacheService } from '@/services/cache/cache.service';
+import { retryUntil } from '@test-integration/retry-until';
+
+import { mockInstance } from '../../../../test/shared/mocking';
+import { TaskRunnerAuthService } from '../task-runner-auth.service';
+
+describe('TaskRunnerAuthService', () => {
+	config.set('taskRunners.authToken', 'random-secret');
+
+	const globalConfig = mockInstance(GlobalConfig, {
+		cache: {
+			backend: 'memory',
+			memory: {
+				maxSize: 1024,
+				ttl: 9999,
+			},
+		},
+		taskRunners: {
+			authToken: 'random-secret',
+		},
+	});
+	const TTL = 100;
+	const cacheService = new CacheService(globalConfig);
+	const authService = new TaskRunnerAuthService(globalConfig, cacheService, TTL);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('isValidAuthToken', () => {
+		it('should be valid for the configured token', () => {
+			expect(authService.isValidAuthToken('random-secret'));
+		});
+
+		it('should be invalid for anything else', () => {
+			expect(authService.isValidAuthToken('!random-secret'));
+		});
+	});
+
+	describe('createGrantToken', () => {
+		it('should generate a random token', async () => {
+			expect(typeof (await authService.createGrantToken())).toBe('string');
+		});
+
+		it('should store the generated token in cache', async () => {
+			// Arrange
+			const cacheSetSpy = jest.spyOn(cacheService, 'set');
+
+			// Act
+			const token = await authService.createGrantToken();
+
+			// Assert
+			expect(cacheSetSpy).toHaveBeenCalledWith(`grant-token:${token}`, '1', TTL);
+		});
+	});
+
+	describe('tryConsumeGrantToken', () => {
+		it('should return false for an invalid grant token', async () => {
+			expect(await authService.tryConsumeGrantToken('random-secret')).toBe(false);
+		});
+
+		it('should return true for a valid grant token', async () => {
+			// Arrange
+			const grantToken = await authService.createGrantToken();
+
+			// Act
+			expect(await authService.tryConsumeGrantToken(grantToken)).toBe(true);
+		});
+
+		it('should return false for a already used grant token', async () => {
+			// Arrange
+			const grantToken = await authService.createGrantToken();
+
+			// Act
+			expect(await authService.tryConsumeGrantToken(grantToken)).toBe(true);
+			expect(await authService.tryConsumeGrantToken(grantToken)).toBe(false);
+		});
+
+		it('should return false for an expired grant token', async () => {
+			// Arrange
+			const grantToken = await authService.createGrantToken();
+
+			// Act
+			await sleep(TTL + 1);
+
+			await retryUntil(async () =>
+				expect(await authService.tryConsumeGrantToken(grantToken)).toBe(false),
+			);
+		});
+	});
+});
diff --git a/packages/cli/src/runners/auth/task-runner-auth.controller.ts b/packages/cli/src/runners/auth/task-runner-auth.controller.ts
new file mode 100644
index 0000000000..a117dfca0d
--- /dev/null
+++ b/packages/cli/src/runners/auth/task-runner-auth.controller.ts
@@ -0,0 +1,62 @@
+import type { NextFunction, Response } from 'express';
+import { Service } from 'typedi';
+
+import type { AuthlessRequest } from '@/requests';
+
+import { taskRunnerAuthRequestBodySchema } from './task-runner-auth.schema';
+import { TaskRunnerAuthService } from './task-runner-auth.service';
+import { BadRequestError } from '../../errors/response-errors/bad-request.error';
+import { ForbiddenError } from '../../errors/response-errors/forbidden.error';
+import type { TaskRunnerServerInitRequest } from '../runner-types';
+
+/**
+ * Controller responsible for authenticating Task Runner connections
+ */
+@Service()
+export class TaskRunnerAuthController {
+	constructor(private readonly taskRunnerAuthService: TaskRunnerAuthService) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		this.authMiddleware = this.authMiddleware.bind(this);
+	}
+
+	/**
+	 * Validates the provided auth token and creates and responds with a grant token,
+	 * which can be used to initiate a task runner connection.
+	 */
+	async createGrantToken(req: AuthlessRequest) {
+		const result = await taskRunnerAuthRequestBodySchema.safeParseAsync(req.body);
+		if (!result.success) {
+			throw new BadRequestError(result.error.errors[0].code);
+		}
+
+		const { token: authToken } = result.data;
+		if (!this.taskRunnerAuthService.isValidAuthToken(authToken)) {
+			throw new ForbiddenError();
+		}
+
+		const grantToken = await this.taskRunnerAuthService.createGrantToken();
+		return {
+			token: grantToken,
+		};
+	}
+
+	/**
+	 * Middleware to authenticate task runner init requests
+	 */
+	async authMiddleware(req: TaskRunnerServerInitRequest, res: Response, next: NextFunction) {
+		const authHeader = req.headers.authorization;
+		if (typeof authHeader !== 'string' || !authHeader.startsWith('Bearer ')) {
+			res.status(401).json({ code: 401, message: 'Unauthorized' });
+			return;
+		}
+
+		const grantToken = authHeader.slice('Bearer '.length);
+		const isConsumed = await this.taskRunnerAuthService.tryConsumeGrantToken(grantToken);
+		if (!isConsumed) {
+			res.status(403).json({ code: 403, message: 'Forbidden' });
+			return;
+		}
+
+		next();
+	}
+}
diff --git a/packages/cli/src/runners/auth/task-runner-auth.schema.ts b/packages/cli/src/runners/auth/task-runner-auth.schema.ts
new file mode 100644
index 0000000000..c3ab2c17f2
--- /dev/null
+++ b/packages/cli/src/runners/auth/task-runner-auth.schema.ts
@@ -0,0 +1,5 @@
+import { z } from 'zod';
+
+export const taskRunnerAuthRequestBodySchema = z.object({
+	token: z.string().min(1),
+});
diff --git a/packages/cli/src/runners/auth/task-runner-auth.service.ts b/packages/cli/src/runners/auth/task-runner-auth.service.ts
new file mode 100644
index 0000000000..5907cf6678
--- /dev/null
+++ b/packages/cli/src/runners/auth/task-runner-auth.service.ts
@@ -0,0 +1,56 @@
+import { GlobalConfig } from '@n8n/config';
+import { randomBytes } from 'crypto';
+import { Service } from 'typedi';
+
+import { Time } from '@/constants';
+import { CacheService } from '@/services/cache/cache.service';
+
+const GRANT_TOKEN_TTL = 15 * Time.seconds.toMilliseconds;
+
+@Service()
+export class TaskRunnerAuthService {
+	constructor(
+		private readonly globalConfig: GlobalConfig,
+		private readonly cacheService: CacheService,
+		// For unit testing purposes
+		private readonly grantTokenTtl = GRANT_TOKEN_TTL,
+	) {}
+
+	isValidAuthToken(token: string) {
+		return token === this.globalConfig.taskRunners.authToken;
+	}
+
+	/**
+	 * @returns grant token that can be used to establish a task runner connection
+	 */
+	async createGrantToken() {
+		const grantToken = this.generateGrantToken();
+
+		const key = this.cacheKeyForGrantToken(grantToken);
+		await this.cacheService.set(key, '1', this.grantTokenTtl);
+
+		return grantToken;
+	}
+
+	/**
+	 * Checks if the given `grantToken` is a valid token and marks it as
+	 * used.
+	 */
+	async tryConsumeGrantToken(grantToken: string) {
+		const key = this.cacheKeyForGrantToken(grantToken);
+		const consumed = await this.cacheService.get<string>(key);
+		// Not found from cache --> Invalid token
+		if (consumed === undefined) return false;
+
+		await this.cacheService.delete(key);
+		return true;
+	}
+
+	private generateGrantToken() {
+		return randomBytes(32).toString('hex');
+	}
+
+	private cacheKeyForGrantToken(grantToken: string) {
+		return `grant-token:${grantToken}`;
+	}
+}
diff --git a/packages/cli/src/runners/errors.ts b/packages/cli/src/runners/errors.ts
new file mode 100644
index 0000000000..cc53e18fd4
--- /dev/null
+++ b/packages/cli/src/runners/errors.ts
@@ -0,0 +1,9 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class TaskRejectError extends ApplicationError {
+	constructor(public reason: string) {
+		super(`Task rejected with reason: ${reason}`, { level: 'info' });
+	}
+}
+
+export class TaskError extends ApplicationError {}
diff --git a/packages/cli/src/runners/runner-types.ts b/packages/cli/src/runners/runner-types.ts
new file mode 100644
index 0000000000..f615754e02
--- /dev/null
+++ b/packages/cli/src/runners/runner-types.ts
@@ -0,0 +1,243 @@
+import type { Response } from 'express';
+import type { INodeExecutionData } from 'n8n-workflow';
+import type WebSocket from 'ws';
+
+import type { TaskRunner } from './task-broker.service';
+import type { AuthlessRequest } from '../requests';
+
+export type DataRequestType = 'input' | 'node' | 'all';
+
+export interface TaskResultData {
+	result: INodeExecutionData[];
+	customData?: Record<string, string>;
+}
+
+export interface TaskRunnerServerInitRequest
+	extends AuthlessRequest<{}, {}, {}, { id: TaskRunner['id']; token?: string }> {
+	ws: WebSocket;
+}
+
+export type TaskRunnerServerInitResponse = Response & { req: TaskRunnerServerInitRequest };
+
+export namespace N8nMessage {
+	export namespace ToRunner {
+		export interface InfoRequest {
+			type: 'broker:inforequest';
+		}
+
+		export interface RunnerRegistered {
+			type: 'broker:runnerregistered';
+		}
+
+		export interface TaskOfferAccept {
+			type: 'broker:taskofferaccept';
+			taskId: string;
+			offerId: string;
+		}
+
+		export interface TaskCancel {
+			type: 'broker:taskcancel';
+			taskId: string;
+			reason: string;
+		}
+
+		export interface TaskSettings {
+			type: 'broker:tasksettings';
+			taskId: string;
+			settings: unknown;
+		}
+
+		export interface RPCResponse {
+			type: 'broker:rpcresponse';
+			callId: string;
+			taskId: string;
+			status: 'success' | 'error';
+			data: unknown;
+		}
+
+		export interface TaskDataResponse {
+			type: 'broker:taskdataresponse';
+			taskId: string;
+			requestId: string;
+			data: unknown;
+		}
+
+		export type All =
+			| InfoRequest
+			| TaskOfferAccept
+			| TaskCancel
+			| TaskSettings
+			| RunnerRegistered
+			| RPCResponse
+			| TaskDataResponse;
+	}
+
+	export namespace ToRequester {
+		export interface TaskReady {
+			type: 'broker:taskready';
+			requestId: string;
+			taskId: string;
+		}
+
+		export interface TaskDone {
+			type: 'broker:taskdone';
+			taskId: string;
+			data: TaskResultData;
+		}
+
+		export interface TaskError {
+			type: 'broker:taskerror';
+			taskId: string;
+			error: unknown;
+		}
+
+		export interface TaskDataRequest {
+			type: 'broker:taskdatarequest';
+			taskId: string;
+			requestId: string;
+			requestType: DataRequestType;
+			param?: string;
+		}
+
+		export interface RPC {
+			type: 'broker:rpc';
+			callId: string;
+			taskId: string;
+			name: (typeof RPC_ALLOW_LIST)[number];
+			params: unknown[];
+		}
+
+		export type All = TaskReady | TaskDone | TaskError | TaskDataRequest | RPC;
+	}
+}
+
+export namespace RequesterMessage {
+	export namespace ToN8n {
+		export interface TaskSettings {
+			type: 'requester:tasksettings';
+			taskId: string;
+			settings: unknown;
+		}
+
+		export interface TaskCancel {
+			type: 'requester:taskcancel';
+			taskId: string;
+			reason: string;
+		}
+
+		export interface TaskDataResponse {
+			type: 'requester:taskdataresponse';
+			taskId: string;
+			requestId: string;
+			data: unknown;
+		}
+
+		export interface RPCResponse {
+			type: 'requester:rpcresponse';
+			taskId: string;
+			callId: string;
+			status: 'success' | 'error';
+			data: unknown;
+		}
+
+		export interface TaskRequest {
+			type: 'requester:taskrequest';
+			requestId: string;
+			taskType: string;
+		}
+
+		export type All = TaskSettings | TaskCancel | RPCResponse | TaskDataResponse | TaskRequest;
+	}
+}
+
+export namespace RunnerMessage {
+	export namespace ToN8n {
+		export interface Info {
+			type: 'runner:info';
+			name: string;
+			types: string[];
+		}
+
+		export interface TaskAccepted {
+			type: 'runner:taskaccepted';
+			taskId: string;
+		}
+
+		export interface TaskRejected {
+			type: 'runner:taskrejected';
+			taskId: string;
+			reason: string;
+		}
+
+		export interface TaskDone {
+			type: 'runner:taskdone';
+			taskId: string;
+			data: TaskResultData;
+		}
+
+		export interface TaskError {
+			type: 'runner:taskerror';
+			taskId: string;
+			error: unknown;
+		}
+
+		export interface TaskOffer {
+			type: 'runner:taskoffer';
+			offerId: string;
+			taskType: string;
+			validFor: number;
+		}
+
+		export interface TaskDataRequest {
+			type: 'runner:taskdatarequest';
+			taskId: string;
+			requestId: string;
+			requestType: DataRequestType;
+			param?: string;
+		}
+
+		export interface RPC {
+			type: 'runner:rpc';
+			callId: string;
+			taskId: string;
+			name: (typeof RPC_ALLOW_LIST)[number];
+			params: unknown[];
+		}
+
+		export type All =
+			| Info
+			| TaskDone
+			| TaskError
+			| TaskAccepted
+			| TaskRejected
+			| TaskOffer
+			| RPC
+			| TaskDataRequest;
+	}
+}
+
+export const RPC_ALLOW_LIST = [
+	'logNodeOutput',
+	'helpers.httpRequestWithAuthentication',
+	'helpers.requestWithAuthenticationPaginated',
+	// "helpers.normalizeItems"
+	// "helpers.constructExecutionMetaData"
+	// "helpers.assertBinaryData"
+	'helpers.getBinaryDataBuffer',
+	// "helpers.copyInputItems"
+	// "helpers.returnJsonArray"
+	'helpers.getSSHClient',
+	'helpers.createReadStream',
+	// "helpers.getStoragePath"
+	'helpers.writeContentToFile',
+	'helpers.prepareBinaryData',
+	'helpers.setBinaryDataBuffer',
+	'helpers.copyBinaryFile',
+	'helpers.binaryToBuffer',
+	// "helpers.binaryToString"
+	// "helpers.getBinaryPath"
+	'helpers.getBinaryStream',
+	'helpers.getBinaryMetadata',
+	'helpers.createDeferredPromise',
+	'helpers.httpRequest',
+] as const;
diff --git a/packages/cli/src/runners/runner-ws-server.ts b/packages/cli/src/runners/runner-ws-server.ts
new file mode 100644
index 0000000000..ef9e52f5f5
--- /dev/null
+++ b/packages/cli/src/runners/runner-ws-server.ts
@@ -0,0 +1,189 @@
+import { GlobalConfig } from '@n8n/config';
+import type { Application } from 'express';
+import { ServerResponse, type Server } from 'http';
+import { ApplicationError } from 'n8n-workflow';
+import type { Socket } from 'net';
+import Container, { Service } from 'typedi';
+import { parse as parseUrl } from 'url';
+import { Server as WSServer } from 'ws';
+import type WebSocket from 'ws';
+
+import { Logger } from '@/logging/logger.service';
+import { send } from '@/response-helper';
+import { TaskRunnerAuthController } from '@/runners/auth/task-runner-auth.controller';
+
+import type {
+	RunnerMessage,
+	N8nMessage,
+	TaskRunnerServerInitRequest,
+	TaskRunnerServerInitResponse,
+} from './runner-types';
+import { TaskBroker, type MessageCallback, type TaskRunner } from './task-broker.service';
+
+function heartbeat(this: WebSocket) {
+	this.isAlive = true;
+}
+
+function getEndpointBasePath(restEndpoint: string) {
+	const globalConfig = Container.get(GlobalConfig);
+
+	let path = globalConfig.taskRunners.path;
+	if (path.startsWith('/')) {
+		path = path.slice(1);
+	}
+	if (path.endsWith('/')) {
+		path = path.slice(-1);
+	}
+
+	return `/${restEndpoint}/${path}`;
+}
+
+function getWsEndpoint(restEndpoint: string) {
+	return `${getEndpointBasePath(restEndpoint)}/_ws`;
+}
+
+@Service()
+export class TaskRunnerService {
+	runnerConnections: Map<TaskRunner['id'], WebSocket> = new Map();
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly taskBroker: TaskBroker,
+	) {}
+
+	sendMessage(id: TaskRunner['id'], message: N8nMessage.ToRunner.All) {
+		this.runnerConnections.get(id)?.send(JSON.stringify(message));
+	}
+
+	add(id: TaskRunner['id'], connection: WebSocket) {
+		connection.isAlive = true;
+		connection.on('pong', heartbeat);
+
+		let isConnected = false;
+
+		const onMessage = (data: WebSocket.RawData) => {
+			try {
+				const buffer = Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data);
+
+				const message: RunnerMessage.ToN8n.All = JSON.parse(
+					buffer.toString('utf8'),
+				) as RunnerMessage.ToN8n.All;
+
+				if (!isConnected && message.type !== 'runner:info') {
+					return;
+				} else if (!isConnected && message.type === 'runner:info') {
+					this.removeConnection(id);
+					isConnected = true;
+
+					this.runnerConnections.set(id, connection);
+
+					this.taskBroker.registerRunner(
+						{
+							id,
+							taskTypes: message.types,
+							lastSeen: new Date(),
+							name: message.name,
+						},
+						this.sendMessage.bind(this, id) as MessageCallback,
+					);
+
+					this.sendMessage(id, { type: 'broker:runnerregistered' });
+
+					this.logger.info(`Runner "${message.name}"(${id}) has been registered`);
+					return;
+				}
+
+				void this.taskBroker.onRunnerMessage(id, message);
+			} catch (error) {
+				this.logger.error(`Couldn't parse message from runner "${id}"`, {
+					error: error as unknown,
+					id,
+					data,
+				});
+			}
+		};
+
+		// Makes sure to remove the session if the connection is closed
+		connection.once('close', () => {
+			connection.off('pong', heartbeat);
+			connection.off('message', onMessage);
+			this.removeConnection(id);
+		});
+
+		connection.on('message', onMessage);
+		connection.send(
+			JSON.stringify({ type: 'broker:inforequest' } as N8nMessage.ToRunner.InfoRequest),
+		);
+	}
+
+	removeConnection(id: TaskRunner['id']) {
+		const connection = this.runnerConnections.get(id);
+		if (connection) {
+			this.taskBroker.deregisterRunner(id);
+			connection.close();
+			this.runnerConnections.delete(id);
+		}
+	}
+
+	handleRequest(req: TaskRunnerServerInitRequest, _res: TaskRunnerServerInitResponse) {
+		this.add(req.query.id, req.ws);
+	}
+}
+
+// Checks for upgrade requests on the runners path and upgrades the connection
+// then, passes the request back to the app to handle the routing
+export const setupRunnerServer = (restEndpoint: string, server: Server, app: Application) => {
+	const globalConfig = Container.get(GlobalConfig);
+	const { authToken } = globalConfig.taskRunners;
+
+	if (!authToken) {
+		throw new ApplicationError(
+			'Authentication token must be configured when task runners are enabled. Use N8N_RUNNERS_AUTH_TOKEN environment variable to set it.',
+		);
+	}
+
+	const endpoint = getWsEndpoint(restEndpoint);
+	const wsServer = new WSServer({ noServer: true });
+	server.on('upgrade', (request: TaskRunnerServerInitRequest, socket: Socket, head) => {
+		if (parseUrl(request.url).pathname !== endpoint) {
+			// We can't close the connection here since the Push connections
+			// are using the same HTTP server and upgrade requests and this
+			// gets triggered for both
+			return;
+		}
+
+		wsServer.handleUpgrade(request, socket, head, (ws) => {
+			request.ws = ws;
+
+			const response = new ServerResponse(request);
+			response.writeHead = (statusCode) => {
+				if (statusCode > 200) ws.close();
+				return response;
+			};
+
+			// @ts-expect-error Hidden API?
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+			app.handle(request, response);
+		});
+	});
+};
+
+export const setupRunnerHandler = (restEndpoint: string, app: Application) => {
+	const wsEndpoint = getWsEndpoint(restEndpoint);
+	const authEndpoint = `${getEndpointBasePath(restEndpoint)}/auth`;
+
+	const taskRunnerAuthController = Container.get(TaskRunnerAuthController);
+	const taskRunnerService = Container.get(TaskRunnerService);
+	app.use(
+		wsEndpoint,
+		// eslint-disable-next-line @typescript-eslint/unbound-method
+		taskRunnerAuthController.authMiddleware,
+		(req: TaskRunnerServerInitRequest, res: TaskRunnerServerInitResponse) =>
+			taskRunnerService.handleRequest(req, res),
+	);
+
+	app.post(
+		authEndpoint,
+		send(async (req) => await taskRunnerAuthController.createGrantToken(req)),
+	);
+};
diff --git a/packages/cli/src/runners/task-broker.service.ts b/packages/cli/src/runners/task-broker.service.ts
new file mode 100644
index 0000000000..829910b468
--- /dev/null
+++ b/packages/cli/src/runners/task-broker.service.ts
@@ -0,0 +1,553 @@
+import { ApplicationError } from 'n8n-workflow';
+import { nanoid } from 'nanoid';
+import { Service } from 'typedi';
+
+import { Logger } from '@/logging/logger.service';
+
+import { TaskRejectError } from './errors';
+import type { N8nMessage, RunnerMessage, RequesterMessage, TaskResultData } from './runner-types';
+
+export interface TaskRunner {
+	id: string;
+	name?: string;
+	taskTypes: string[];
+	lastSeen: Date;
+}
+
+export interface Task {
+	id: string;
+	runnerId: TaskRunner['id'];
+	requesterId: string;
+	taskType: string;
+}
+
+export interface TaskOffer {
+	offerId: string;
+	runnerId: TaskRunner['id'];
+	taskType: string;
+	validFor: number;
+	validUntil: bigint;
+}
+
+export interface TaskRequest {
+	requestId: string;
+	requesterId: string;
+	taskType: string;
+
+	acceptInProgress?: boolean;
+}
+
+export type MessageCallback = (message: N8nMessage.ToRunner.All) => Promise<void> | void;
+export type RequesterMessageCallback = (
+	message: N8nMessage.ToRequester.All,
+) => Promise<void> | void;
+
+type RunnerAcceptCallback = () => void;
+type RequesterAcceptCallback = (settings: RequesterMessage.ToN8n.TaskSettings['settings']) => void;
+type TaskRejectCallback = (reason: TaskRejectError) => void;
+
+@Service()
+export class TaskBroker {
+	private knownRunners: Map<
+		TaskRunner['id'],
+		{ runner: TaskRunner; messageCallback: MessageCallback }
+	> = new Map();
+
+	private requesters: Map<string, RequesterMessageCallback> = new Map();
+
+	private tasks: Map<Task['id'], Task> = new Map();
+
+	private runnerAcceptRejects: Map<
+		Task['id'],
+		{ accept: RunnerAcceptCallback; reject: TaskRejectCallback }
+	> = new Map();
+
+	private requesterAcceptRejects: Map<
+		Task['id'],
+		{ accept: RequesterAcceptCallback; reject: TaskRejectCallback }
+	> = new Map();
+
+	private pendingTaskOffers: TaskOffer[] = [];
+
+	private pendingTaskRequests: TaskRequest[] = [];
+
+	constructor(private readonly logger: Logger) {}
+
+	expireTasks() {
+		const now = process.hrtime.bigint();
+		const invalidOffers: number[] = [];
+		for (let i = 0; i < this.pendingTaskOffers.length; i++) {
+			if (this.pendingTaskOffers[i].validUntil < now) {
+				invalidOffers.push(i);
+			}
+		}
+
+		// We reverse the list so the later indexes are valid after deleting earlier ones
+		invalidOffers.reverse().forEach((i) => this.pendingTaskOffers.splice(i, 1));
+	}
+
+	registerRunner(runner: TaskRunner, messageCallback: MessageCallback) {
+		this.knownRunners.set(runner.id, { runner, messageCallback });
+	}
+
+	deregisterRunner(runnerId: string) {
+		this.knownRunners.delete(runnerId);
+	}
+
+	registerRequester(requesterId: string, messageCallback: RequesterMessageCallback) {
+		this.requesters.set(requesterId, messageCallback);
+	}
+
+	deregisterRequester(requesterId: string) {
+		this.requesters.delete(requesterId);
+	}
+
+	private async messageRunner(runnerId: TaskRunner['id'], message: N8nMessage.ToRunner.All) {
+		await this.knownRunners.get(runnerId)?.messageCallback(message);
+	}
+
+	private async messageRequester(requesterId: string, message: N8nMessage.ToRequester.All) {
+		await this.requesters.get(requesterId)?.(message);
+	}
+
+	async onRunnerMessage(runnerId: TaskRunner['id'], message: RunnerMessage.ToN8n.All) {
+		const runner = this.knownRunners.get(runnerId);
+		if (!runner) {
+			return;
+		}
+		switch (message.type) {
+			case 'runner:taskaccepted':
+				this.handleRunnerAccept(message.taskId);
+				break;
+			case 'runner:taskrejected':
+				this.handleRunnerReject(message.taskId, message.reason);
+				break;
+			case 'runner:taskoffer':
+				this.taskOffered({
+					runnerId,
+					taskType: message.taskType,
+					offerId: message.offerId,
+					validFor: message.validFor,
+					validUntil: process.hrtime.bigint() + BigInt(message.validFor * 1_000_000),
+				});
+				break;
+			case 'runner:taskdone':
+				await this.taskDoneHandler(message.taskId, message.data);
+				break;
+			case 'runner:taskerror':
+				await this.taskErrorHandler(message.taskId, message.error);
+				break;
+			case 'runner:taskdatarequest':
+				await this.handleDataRequest(
+					message.taskId,
+					message.requestId,
+					message.requestType,
+					message.param,
+				);
+				break;
+
+			case 'runner:rpc':
+				await this.handleRpcRequest(message.taskId, message.callId, message.name, message.params);
+				break;
+			// Already handled
+			case 'runner:info':
+				break;
+		}
+	}
+
+	async handleRpcRequest(
+		taskId: Task['id'],
+		callId: string,
+		name: RunnerMessage.ToN8n.RPC['name'],
+		params: unknown[],
+	) {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		await this.messageRequester(task.requesterId, {
+			type: 'broker:rpc',
+			taskId,
+			callId,
+			name,
+			params,
+		});
+	}
+
+	handleRunnerAccept(taskId: Task['id']) {
+		const acceptReject = this.runnerAcceptRejects.get(taskId);
+		if (acceptReject) {
+			acceptReject.accept();
+			this.runnerAcceptRejects.delete(taskId);
+		}
+	}
+
+	handleRunnerReject(taskId: Task['id'], reason: string) {
+		const acceptReject = this.runnerAcceptRejects.get(taskId);
+		if (acceptReject) {
+			acceptReject.reject(new TaskRejectError(reason));
+			this.runnerAcceptRejects.delete(taskId);
+		}
+	}
+
+	async handleDataRequest(
+		taskId: Task['id'],
+		requestId: RunnerMessage.ToN8n.TaskDataRequest['requestId'],
+		requestType: RunnerMessage.ToN8n.TaskDataRequest['requestType'],
+		param?: string,
+	) {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		await this.messageRequester(task.requesterId, {
+			type: 'broker:taskdatarequest',
+			taskId,
+			requestId,
+			requestType,
+			param,
+		});
+	}
+
+	async handleResponse(
+		taskId: Task['id'],
+		requestId: RunnerMessage.ToN8n.TaskDataRequest['requestId'],
+		data: unknown,
+	) {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		await this.messageRunner(task.requesterId, {
+			type: 'broker:taskdataresponse',
+			taskId,
+			requestId,
+			data,
+		});
+	}
+
+	async onRequesterMessage(requesterId: string, message: RequesterMessage.ToN8n.All) {
+		switch (message.type) {
+			case 'requester:tasksettings':
+				this.handleRequesterAccept(message.taskId, message.settings);
+				break;
+			case 'requester:taskcancel':
+				await this.cancelTask(message.taskId, message.reason);
+				break;
+			case 'requester:taskrequest':
+				this.taskRequested({
+					taskType: message.taskType,
+					requestId: message.requestId,
+					requesterId,
+				});
+				break;
+			case 'requester:taskdataresponse':
+				await this.handleRequesterDataResponse(message.taskId, message.requestId, message.data);
+				break;
+			case 'requester:rpcresponse':
+				await this.handleRequesterRpcResponse(
+					message.taskId,
+					message.callId,
+					message.status,
+					message.data,
+				);
+				break;
+		}
+	}
+
+	async handleRequesterRpcResponse(
+		taskId: string,
+		callId: string,
+		status: RequesterMessage.ToN8n.RPCResponse['status'],
+		data: unknown,
+	) {
+		const runner = await this.getRunnerOrFailTask(taskId);
+		await this.messageRunner(runner.id, {
+			type: 'broker:rpcresponse',
+			taskId,
+			callId,
+			status,
+			data,
+		});
+	}
+
+	async handleRequesterDataResponse(taskId: Task['id'], requestId: string, data: unknown) {
+		const runner = await this.getRunnerOrFailTask(taskId);
+
+		await this.messageRunner(runner.id, {
+			type: 'broker:taskdataresponse',
+			taskId,
+			requestId,
+			data,
+		});
+	}
+
+	handleRequesterAccept(
+		taskId: Task['id'],
+		settings: RequesterMessage.ToN8n.TaskSettings['settings'],
+	) {
+		const acceptReject = this.requesterAcceptRejects.get(taskId);
+		if (acceptReject) {
+			acceptReject.accept(settings);
+			this.requesterAcceptRejects.delete(taskId);
+		}
+	}
+
+	handleRequesterReject(taskId: Task['id'], reason: string) {
+		const acceptReject = this.requesterAcceptRejects.get(taskId);
+		if (acceptReject) {
+			acceptReject.reject(new TaskRejectError(reason));
+			this.requesterAcceptRejects.delete(taskId);
+		}
+	}
+
+	private async cancelTask(taskId: Task['id'], reason: string) {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		this.tasks.delete(taskId);
+
+		await this.messageRunner(task.runnerId, {
+			type: 'broker:taskcancel',
+			taskId,
+			reason,
+		});
+	}
+
+	private async failTask(taskId: Task['id'], reason: string) {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		this.tasks.delete(taskId);
+		// TODO: special message type?
+		await this.messageRequester(task.requesterId, {
+			type: 'broker:taskerror',
+			taskId,
+			error: reason,
+		});
+	}
+
+	private async getRunnerOrFailTask(taskId: Task['id']): Promise<TaskRunner> {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			throw new ApplicationError(`Cannot find runner, failed to find task (${taskId})`, {
+				level: 'error',
+			});
+		}
+		const runner = this.knownRunners.get(task.runnerId);
+		if (!runner) {
+			const reason = `Cannot find runner, failed to find runner (${task.runnerId})`;
+			await this.failTask(taskId, reason);
+			throw new ApplicationError(reason, {
+				level: 'error',
+			});
+		}
+		return runner.runner;
+	}
+
+	async sendTaskSettings(taskId: Task['id'], settings: unknown) {
+		const runner = await this.getRunnerOrFailTask(taskId);
+		await this.messageRunner(runner.id, {
+			type: 'broker:tasksettings',
+			taskId,
+			settings,
+		});
+	}
+
+	async taskDoneHandler(taskId: Task['id'], data: TaskResultData) {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		await this.requesters.get(task.requesterId)?.({
+			type: 'broker:taskdone',
+			taskId: task.id,
+			data,
+		});
+		this.tasks.delete(task.id);
+	}
+
+	async taskErrorHandler(taskId: Task['id'], error: unknown) {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		await this.requesters.get(task.requesterId)?.({
+			type: 'broker:taskerror',
+			taskId: task.id,
+			error,
+		});
+		this.tasks.delete(task.id);
+	}
+
+	async acceptOffer(offer: TaskOffer, request: TaskRequest): Promise<void> {
+		const taskId = nanoid(8);
+
+		try {
+			const acceptPromise = new Promise((resolve, reject) => {
+				this.runnerAcceptRejects.set(taskId, { accept: resolve as () => void, reject });
+
+				// TODO: customisable timeout
+				setTimeout(() => {
+					reject('Runner timed out');
+				}, 2000);
+			});
+
+			await this.messageRunner(offer.runnerId, {
+				type: 'broker:taskofferaccept',
+				offerId: offer.offerId,
+				taskId,
+			});
+
+			await acceptPromise;
+		} catch (e) {
+			request.acceptInProgress = false;
+			if (e instanceof TaskRejectError) {
+				this.logger.info(`Task (${taskId}) rejected by Runner with reason "${e.reason}"`);
+				return;
+			}
+			throw e;
+		}
+
+		const task: Task = {
+			id: taskId,
+			taskType: offer.taskType,
+			runnerId: offer.runnerId,
+			requesterId: request.requesterId,
+		};
+
+		this.tasks.set(taskId, task);
+		const requestIndex = this.pendingTaskRequests.findIndex(
+			(r) => r.requestId === request.requestId,
+		);
+		if (requestIndex === -1) {
+			this.logger.error(
+				`Failed to find task request (${request.requestId}) after a task was accepted. This shouldn't happen, and might be a race condition.`,
+			);
+			return;
+		}
+		this.pendingTaskRequests.splice(requestIndex, 1);
+
+		try {
+			const acceptPromise = new Promise<RequesterMessage.ToN8n.TaskSettings['settings']>(
+				(resolve, reject) => {
+					this.requesterAcceptRejects.set(taskId, {
+						accept: resolve as (settings: RequesterMessage.ToN8n.TaskSettings['settings']) => void,
+						reject,
+					});
+
+					// TODO: customisable timeout
+					setTimeout(() => {
+						reject('Requester timed out');
+					}, 2000);
+				},
+			);
+
+			await this.messageRequester(request.requesterId, {
+				type: 'broker:taskready',
+				requestId: request.requestId,
+				taskId,
+			});
+
+			const settings = await acceptPromise;
+			await this.sendTaskSettings(task.id, settings);
+		} catch (e) {
+			if (e instanceof TaskRejectError) {
+				await this.cancelTask(task.id, e.reason);
+				this.logger.info(`Task (${taskId}) rejected by Requester with reason "${e.reason}"`);
+				return;
+			}
+			await this.cancelTask(task.id, 'Unknown reason');
+			throw e;
+		}
+	}
+
+	// Find matching task offers and requests, then let the runner
+	// know that an offer has been accepted
+	//
+	// *DO NOT MAKE THIS FUNCTION ASYNC*
+	// This function relies on never yielding.
+	// If you need to make this function async, you'll need to
+	// implement some kind of locking for the requests and task
+	// lists
+	settleTasks() {
+		this.expireTasks();
+
+		for (const request of this.pendingTaskRequests) {
+			if (request.acceptInProgress) {
+				continue;
+			}
+			const offerIndex = this.pendingTaskOffers.findIndex((o) => o.taskType === request.taskType);
+			if (offerIndex === -1) {
+				continue;
+			}
+			const offer = this.pendingTaskOffers[offerIndex];
+
+			request.acceptInProgress = true;
+			this.pendingTaskOffers.splice(offerIndex, 1);
+
+			void this.acceptOffer(offer, request);
+		}
+	}
+
+	taskRequested(request: TaskRequest) {
+		this.pendingTaskRequests.push(request);
+		this.settleTasks();
+	}
+
+	taskOffered(offer: TaskOffer) {
+		this.pendingTaskOffers.push(offer);
+		this.settleTasks();
+	}
+
+	/**
+	 * For testing only
+	 */
+
+	getTasks() {
+		return this.tasks;
+	}
+
+	getPendingTaskOffers() {
+		return this.pendingTaskOffers;
+	}
+
+	getPendingTaskRequests() {
+		return this.pendingTaskRequests;
+	}
+
+	getKnownRunners() {
+		return this.knownRunners;
+	}
+
+	getKnownRequesters() {
+		return this.requesters;
+	}
+
+	getRunnerAcceptRejects() {
+		return this.runnerAcceptRejects;
+	}
+
+	setTasks(tasks: Record<string, Task>) {
+		this.tasks = new Map(Object.entries(tasks));
+	}
+
+	setPendingTaskOffers(pendingTaskOffers: TaskOffer[]) {
+		this.pendingTaskOffers = pendingTaskOffers;
+	}
+
+	setPendingTaskRequests(pendingTaskRequests: TaskRequest[]) {
+		this.pendingTaskRequests = pendingTaskRequests;
+	}
+
+	setRunnerAcceptRejects(
+		runnerAcceptRejects: Record<
+			string,
+			{ accept: RunnerAcceptCallback; reject: TaskRejectCallback }
+		>,
+	) {
+		this.runnerAcceptRejects = new Map(Object.entries(runnerAcceptRejects));
+	}
+}
diff --git a/packages/cli/src/runners/task-managers/single-main-task-manager.ts b/packages/cli/src/runners/task-managers/single-main-task-manager.ts
new file mode 100644
index 0000000000..b5b60df72b
--- /dev/null
+++ b/packages/cli/src/runners/task-managers/single-main-task-manager.ts
@@ -0,0 +1,30 @@
+import Container from 'typedi';
+
+import { TaskManager } from './task-manager';
+import type { RequesterMessage } from '../runner-types';
+import type { RequesterMessageCallback } from '../task-broker.service';
+import { TaskBroker } from '../task-broker.service';
+
+export class SingleMainTaskManager extends TaskManager {
+	taskBroker: TaskBroker;
+
+	id: string = 'single-main';
+
+	constructor() {
+		super();
+		this.registerRequester();
+	}
+
+	registerRequester() {
+		this.taskBroker = Container.get(TaskBroker);
+
+		this.taskBroker.registerRequester(
+			this.id,
+			this.onMessage.bind(this) as RequesterMessageCallback,
+		);
+	}
+
+	sendMessage(message: RequesterMessage.ToN8n.All) {
+		void this.taskBroker.onRequesterMessage(this.id, message);
+	}
+}
diff --git a/packages/cli/src/runners/task-managers/task-manager.ts b/packages/cli/src/runners/task-managers/task-manager.ts
new file mode 100644
index 0000000000..58d8ade906
--- /dev/null
+++ b/packages/cli/src/runners/task-managers/task-manager.ts
@@ -0,0 +1,413 @@
+import {
+	type EnvProviderState,
+	type IExecuteFunctions,
+	type Workflow,
+	type IRunExecutionData,
+	type INodeExecutionData,
+	type ITaskDataConnections,
+	type INode,
+	type WorkflowParameters,
+	type INodeParameters,
+	type WorkflowExecuteMode,
+	type IExecuteData,
+	type IDataObject,
+	type IWorkflowExecuteAdditionalData,
+	type Result,
+	createResultOk,
+	createResultError,
+} from 'n8n-workflow';
+import { nanoid } from 'nanoid';
+
+import {
+	RPC_ALLOW_LIST,
+	type TaskResultData,
+	type N8nMessage,
+	type RequesterMessage,
+} from '../runner-types';
+
+export type RequestAccept = (jobId: string) => void;
+export type RequestReject = (reason: string) => void;
+
+export type TaskAccept = (data: TaskResultData) => void;
+export type TaskReject = (error: unknown) => void;
+
+export interface TaskData {
+	executeFunctions: IExecuteFunctions;
+	inputData: ITaskDataConnections;
+	node: INode;
+
+	workflow: Workflow;
+	runExecutionData: IRunExecutionData;
+	runIndex: number;
+	itemIndex: number;
+	activeNodeName: string;
+	connectionInputData: INodeExecutionData[];
+	siblingParameters: INodeParameters;
+	mode: WorkflowExecuteMode;
+	envProviderState: EnvProviderState;
+	executeData?: IExecuteData;
+	defaultReturnRunIndex: number;
+	selfData: IDataObject;
+	contextNodeName: string;
+	additionalData: IWorkflowExecuteAdditionalData;
+}
+
+export interface PartialAdditionalData {
+	executionId?: string;
+	restartExecutionId?: string;
+	restApiUrl: string;
+	instanceBaseUrl: string;
+	formWaitingBaseUrl: string;
+	webhookBaseUrl: string;
+	webhookWaitingBaseUrl: string;
+	webhookTestBaseUrl: string;
+	currentNodeParameters?: INodeParameters;
+	executionTimeoutTimestamp?: number;
+	userId?: string;
+	variables: IDataObject;
+}
+
+export interface AllCodeTaskData {
+	workflow: Omit<WorkflowParameters, 'nodeTypes'>;
+	inputData: ITaskDataConnections;
+	node: INode;
+
+	runExecutionData: IRunExecutionData;
+	runIndex: number;
+	itemIndex: number;
+	activeNodeName: string;
+	connectionInputData: INodeExecutionData[];
+	siblingParameters: INodeParameters;
+	mode: WorkflowExecuteMode;
+	envProviderState: EnvProviderState;
+	executeData?: IExecuteData;
+	defaultReturnRunIndex: number;
+	selfData: IDataObject;
+	contextNodeName: string;
+	additionalData: PartialAdditionalData;
+}
+
+export interface TaskRequest {
+	requestId: string;
+	taskType: string;
+	settings: unknown;
+	data: TaskData;
+}
+
+export interface Task {
+	taskId: string;
+	settings: unknown;
+	data: TaskData;
+}
+
+interface ExecuteFunctionObject {
+	[name: string]: ((...args: unknown[]) => unknown) | ExecuteFunctionObject;
+}
+
+const workflowToParameters = (workflow: Workflow): Omit<WorkflowParameters, 'nodeTypes'> => {
+	return {
+		id: workflow.id,
+		name: workflow.name,
+		active: workflow.active,
+		connections: workflow.connectionsBySourceNode,
+		nodes: Object.values(workflow.nodes),
+		pinData: workflow.pinData,
+		settings: workflow.settings,
+		staticData: workflow.staticData,
+	};
+};
+
+export class TaskManager {
+	requestAcceptRejects: Map<string, { accept: RequestAccept; reject: RequestReject }> = new Map();
+
+	taskAcceptRejects: Map<string, { accept: TaskAccept; reject: TaskReject }> = new Map();
+
+	pendingRequests: Map<string, TaskRequest> = new Map();
+
+	tasks: Map<string, Task> = new Map();
+
+	async startTask<TData, TError>(
+		additionalData: IWorkflowExecuteAdditionalData,
+		taskType: string,
+		settings: unknown,
+		executeFunctions: IExecuteFunctions,
+		inputData: ITaskDataConnections,
+		node: INode,
+		workflow: Workflow,
+		runExecutionData: IRunExecutionData,
+		runIndex: number,
+		itemIndex: number,
+		activeNodeName: string,
+		connectionInputData: INodeExecutionData[],
+		siblingParameters: INodeParameters,
+		mode: WorkflowExecuteMode,
+		envProviderState: EnvProviderState,
+		executeData?: IExecuteData,
+		defaultReturnRunIndex = -1,
+		selfData: IDataObject = {},
+		contextNodeName: string = activeNodeName,
+	): Promise<Result<TData, TError>> {
+		const data: TaskData = {
+			workflow,
+			runExecutionData,
+			runIndex,
+			connectionInputData,
+			inputData,
+			node,
+			executeFunctions,
+			itemIndex,
+			siblingParameters,
+			mode,
+			envProviderState,
+			executeData,
+			defaultReturnRunIndex,
+			selfData,
+			contextNodeName,
+			activeNodeName,
+			additionalData,
+		};
+
+		const request: TaskRequest = {
+			requestId: nanoid(),
+			taskType,
+			settings,
+			data,
+		};
+
+		this.pendingRequests.set(request.requestId, request);
+
+		const taskIdPromise = new Promise<string>((resolve, reject) => {
+			this.requestAcceptRejects.set(request.requestId, {
+				accept: resolve,
+				reject,
+			});
+		});
+
+		this.sendMessage({
+			type: 'requester:taskrequest',
+			requestId: request.requestId,
+			taskType,
+		});
+
+		const taskId = await taskIdPromise;
+
+		const task: Task = {
+			taskId,
+			data,
+			settings,
+		};
+		this.tasks.set(task.taskId, task);
+
+		try {
+			const dataPromise = new Promise<TaskResultData>((resolve, reject) => {
+				this.taskAcceptRejects.set(task.taskId, {
+					accept: resolve,
+					reject,
+				});
+			});
+
+			this.sendMessage({
+				type: 'requester:tasksettings',
+				taskId,
+				settings,
+			});
+
+			const resultData = await dataPromise;
+			// Set custom execution data (`$execution.customData`) if sent
+			if (resultData.customData) {
+				Object.entries(resultData.customData).forEach(([k, v]) => {
+					if (!runExecutionData.resultData.metadata) {
+						runExecutionData.resultData.metadata = {};
+					}
+					runExecutionData.resultData.metadata[k] = v;
+				});
+			}
+
+			return createResultOk(resultData.result as TData);
+		} catch (e: unknown) {
+			return createResultError(e as TError);
+		} finally {
+			this.tasks.delete(taskId);
+		}
+	}
+
+	sendMessage(_message: RequesterMessage.ToN8n.All) {}
+
+	onMessage(message: N8nMessage.ToRequester.All) {
+		switch (message.type) {
+			case 'broker:taskready':
+				this.taskReady(message.requestId, message.taskId);
+				break;
+			case 'broker:taskdone':
+				this.taskDone(message.taskId, message.data);
+				break;
+			case 'broker:taskerror':
+				this.taskError(message.taskId, message.error);
+				break;
+			case 'broker:taskdatarequest':
+				this.sendTaskData(message.taskId, message.requestId, message.requestType);
+				break;
+			case 'broker:rpc':
+				void this.handleRpc(message.taskId, message.callId, message.name, message.params);
+				break;
+		}
+	}
+
+	taskReady(requestId: string, taskId: string) {
+		const acceptReject = this.requestAcceptRejects.get(requestId);
+		if (!acceptReject) {
+			this.rejectTask(
+				taskId,
+				'Request ID not found. In multi-main setup, it is possible for one of the mains to have reported ready state already.',
+			);
+			return;
+		}
+
+		acceptReject.accept(taskId);
+		this.requestAcceptRejects.delete(requestId);
+	}
+
+	rejectTask(jobId: string, reason: string) {
+		this.sendMessage({
+			type: 'requester:taskcancel',
+			taskId: jobId,
+			reason,
+		});
+	}
+
+	taskDone(taskId: string, data: TaskResultData) {
+		const acceptReject = this.taskAcceptRejects.get(taskId);
+		if (acceptReject) {
+			acceptReject.accept(data);
+			this.taskAcceptRejects.delete(taskId);
+		}
+	}
+
+	taskError(taskId: string, error: unknown) {
+		const acceptReject = this.taskAcceptRejects.get(taskId);
+		if (acceptReject) {
+			acceptReject.reject(error);
+			this.taskAcceptRejects.delete(taskId);
+		}
+	}
+
+	sendTaskData(
+		taskId: string,
+		requestId: string,
+		requestType: N8nMessage.ToRequester.TaskDataRequest['requestType'],
+	) {
+		const job = this.tasks.get(taskId);
+		if (!job) {
+			// TODO: logging
+			return;
+		}
+		if (requestType === 'all') {
+			const jd = job.data;
+			const ad = jd.additionalData;
+			const data: AllCodeTaskData = {
+				workflow: workflowToParameters(jd.workflow),
+				connectionInputData: jd.connectionInputData,
+				inputData: jd.inputData,
+				itemIndex: jd.itemIndex,
+				activeNodeName: jd.activeNodeName,
+				contextNodeName: jd.contextNodeName,
+				defaultReturnRunIndex: jd.defaultReturnRunIndex,
+				mode: jd.mode,
+				envProviderState: jd.envProviderState,
+				node: jd.node,
+				runExecutionData: jd.runExecutionData,
+				runIndex: jd.runIndex,
+				selfData: jd.selfData,
+				siblingParameters: jd.siblingParameters,
+				executeData: jd.executeData,
+				additionalData: {
+					formWaitingBaseUrl: ad.formWaitingBaseUrl,
+					instanceBaseUrl: ad.instanceBaseUrl,
+					restApiUrl: ad.restApiUrl,
+					variables: ad.variables,
+					webhookBaseUrl: ad.webhookBaseUrl,
+					webhookTestBaseUrl: ad.webhookTestBaseUrl,
+					webhookWaitingBaseUrl: ad.webhookWaitingBaseUrl,
+					currentNodeParameters: ad.currentNodeParameters,
+					executionId: ad.executionId,
+					executionTimeoutTimestamp: ad.executionTimeoutTimestamp,
+					restartExecutionId: ad.restartExecutionId,
+					userId: ad.userId,
+				},
+			};
+			this.sendMessage({
+				type: 'requester:taskdataresponse',
+				taskId,
+				requestId,
+				data,
+			});
+		}
+	}
+
+	async handleRpc(
+		taskId: string,
+		callId: string,
+		name: N8nMessage.ToRequester.RPC['name'],
+		params: unknown[],
+	) {
+		const job = this.tasks.get(taskId);
+		if (!job) {
+			// TODO: logging
+			return;
+		}
+
+		try {
+			if (!RPC_ALLOW_LIST.includes(name)) {
+				this.sendMessage({
+					type: 'requester:rpcresponse',
+					taskId,
+					callId,
+					status: 'error',
+					data: 'Method not allowed',
+				});
+				return;
+			}
+			const splitPath = name.split('.');
+
+			const funcs = job.data.executeFunctions;
+
+			let func: ((...args: unknown[]) => Promise<unknown>) | undefined = undefined;
+			let funcObj: ExecuteFunctionObject[string] | undefined =
+				funcs as unknown as ExecuteFunctionObject;
+			for (const part of splitPath) {
+				funcObj = (funcObj as ExecuteFunctionObject)[part] ?? undefined;
+				if (!funcObj) {
+					break;
+				}
+			}
+			func = funcObj as unknown as (...args: unknown[]) => Promise<unknown>;
+			if (!func) {
+				this.sendMessage({
+					type: 'requester:rpcresponse',
+					taskId,
+					callId,
+					status: 'error',
+					data: 'Could not find method',
+				});
+				return;
+			}
+			const data = (await func.call(funcs, ...params)) as unknown;
+
+			this.sendMessage({
+				type: 'requester:rpcresponse',
+				taskId,
+				callId,
+				status: 'success',
+				data,
+			});
+		} catch (e) {
+			this.sendMessage({
+				type: 'requester:rpcresponse',
+				taskId,
+				callId,
+				status: 'error',
+				data: e,
+			});
+		}
+	}
+}
diff --git a/packages/cli/src/runners/task-runner-process.ts b/packages/cli/src/runners/task-runner-process.ts
new file mode 100644
index 0000000000..9f570fcb38
--- /dev/null
+++ b/packages/cli/src/runners/task-runner-process.ts
@@ -0,0 +1,92 @@
+import { GlobalConfig } from '@n8n/config';
+import * as a from 'node:assert/strict';
+import { spawn } from 'node:child_process';
+import * as process from 'node:process';
+import { Service } from 'typedi';
+
+import { TaskRunnerAuthService } from './auth/task-runner-auth.service';
+import { OnShutdown } from '../decorators/on-shutdown';
+
+type ChildProcess = ReturnType<typeof spawn>;
+
+/**
+ * Manages the JS task runner process as a child process
+ */
+@Service()
+export class TaskRunnerProcess {
+	public get isRunning() {
+		return this.process !== null;
+	}
+
+	/** The process ID of the task runner process */
+	public get pid() {
+		return this.process?.pid;
+	}
+
+	private process: ChildProcess | null = null;
+
+	/** Promise that resolves after the process has exited */
+	private runPromise: Promise<void> | null = null;
+
+	private isShuttingDown = false;
+
+	constructor(
+		private readonly globalConfig: GlobalConfig,
+		private readonly authService: TaskRunnerAuthService,
+	) {}
+
+	async start() {
+		a.ok(!this.process, 'Task Runner Process already running');
+
+		const grantToken = await this.authService.createGrantToken();
+		const startScript = require.resolve('@n8n/task-runner');
+
+		this.process = spawn('node', [startScript], {
+			env: {
+				PATH: process.env.PATH,
+				N8N_RUNNERS_GRANT_TOKEN: grantToken,
+				N8N_RUNNERS_N8N_URI: `127.0.0.1:${this.globalConfig.taskRunners.port}`,
+				NODE_FUNCTION_ALLOW_BUILTIN: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
+				NODE_FUNCTION_ALLOW_EXTERNAL: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
+			},
+		});
+
+		this.process.stdout?.pipe(process.stdout);
+		this.process.stderr?.pipe(process.stderr);
+
+		this.monitorProcess(this.process);
+	}
+
+	@OnShutdown()
+	async stop() {
+		if (!this.process) {
+			return;
+		}
+
+		this.isShuttingDown = true;
+
+		// TODO: Timeout & force kill
+		this.process.kill();
+		await this.runPromise;
+
+		this.isShuttingDown = false;
+	}
+
+	private monitorProcess(taskRunnerProcess: ChildProcess) {
+		this.runPromise = new Promise((resolve) => {
+			taskRunnerProcess.on('exit', (code) => {
+				this.onProcessExit(code, resolve);
+			});
+		});
+	}
+
+	private onProcessExit(_code: number | null, resolveFn: () => void) {
+		this.process = null;
+		resolveFn();
+
+		// If we are not shutting down, restart the process
+		if (!this.isShuttingDown) {
+			setImmediate(async () => await this.start());
+		}
+	}
+}
diff --git a/packages/cli/src/runners/task-runner-server.ts b/packages/cli/src/runners/task-runner-server.ts
new file mode 100644
index 0000000000..fc31c100a3
--- /dev/null
+++ b/packages/cli/src/runners/task-runner-server.ts
@@ -0,0 +1,201 @@
+import { GlobalConfig } from '@n8n/config';
+import compression from 'compression';
+import express from 'express';
+import * as a from 'node:assert/strict';
+import { randomBytes } from 'node:crypto';
+import { ServerResponse, type Server, createServer as createHttpServer } from 'node:http';
+import type { AddressInfo, Socket } from 'node:net';
+import { parse as parseUrl } from 'node:url';
+import { Service } from 'typedi';
+import { Server as WSServer } from 'ws';
+
+import { inTest, LOWEST_SHUTDOWN_PRIORITY } from '@/constants';
+import { OnShutdown } from '@/decorators/on-shutdown';
+import { Logger } from '@/logging/logger.service';
+import { bodyParser, rawBodyReader } from '@/middlewares';
+import { send } from '@/response-helper';
+import { TaskRunnerAuthController } from '@/runners/auth/task-runner-auth.controller';
+import type {
+	TaskRunnerServerInitRequest,
+	TaskRunnerServerInitResponse,
+} from '@/runners/runner-types';
+import { TaskRunnerService } from '@/runners/runner-ws-server';
+
+/**
+ * Task Runner HTTP & WS server
+ */
+@Service()
+export class TaskRunnerServer {
+	private server: Server | undefined;
+
+	private wsServer: WSServer | undefined;
+
+	readonly app: express.Application;
+
+	public get port() {
+		return (this.server?.address() as AddressInfo)?.port;
+	}
+
+	private get upgradeEndpoint() {
+		return `${this.getEndpointBasePath()}/_ws`;
+	}
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly globalConfig: GlobalConfig,
+		private readonly taskRunnerAuthController: TaskRunnerAuthController,
+		private readonly taskRunnerService: TaskRunnerService,
+	) {
+		this.app = express();
+		this.app.disable('x-powered-by');
+
+		if (!this.globalConfig.taskRunners.authToken) {
+			// Generate an auth token if one is not set
+			this.globalConfig.taskRunners.authToken = randomBytes(32).toString('hex');
+		}
+	}
+
+	async start(): Promise<void> {
+		await this.setupHttpServer();
+
+		this.setupWsServer();
+
+		if (!inTest) {
+			await this.setupErrorHandlers();
+		}
+
+		this.setupCommonMiddlewares();
+
+		this.configureRoutes();
+	}
+
+	@OnShutdown(LOWEST_SHUTDOWN_PRIORITY)
+	async stop(): Promise<void> {
+		if (this.wsServer) {
+			this.wsServer.close();
+			this.wsServer = undefined;
+		}
+		if (this.server) {
+			await new Promise<void>((resolve) => this.server?.close(() => resolve()));
+			this.server = undefined;
+		}
+	}
+
+	/** Creates an HTTP server and listens to the configured port */
+	private async setupHttpServer() {
+		const { app } = this;
+
+		this.server = createHttpServer(app);
+
+		const {
+			taskRunners: { port, listen_address: address },
+		} = this.globalConfig;
+
+		this.server.on('error', (error: Error & { code: string }) => {
+			if (error.code === 'EADDRINUSE') {
+				this.logger.info(
+					`n8n Task Runner's port ${port} is already in use. Do you have another instance of n8n running already?`,
+				);
+				process.exit(1);
+			}
+		});
+
+		await new Promise<void>((resolve) => {
+			a.ok(this.server);
+			this.server.listen(port, address, () => resolve());
+		});
+
+		this.logger.info(`n8n Task Runner server ready on ${address}, port ${port}`);
+	}
+
+	/** Creates WebSocket server for handling upgrade requests */
+	private setupWsServer() {
+		const { authToken } = this.globalConfig.taskRunners;
+		a.ok(authToken);
+		a.ok(this.server);
+
+		this.wsServer = new WSServer({ noServer: true });
+		this.server.on('upgrade', this.handleUpgradeRequest);
+	}
+
+	private async setupErrorHandlers() {
+		const { app } = this;
+
+		// Augment errors sent to Sentry
+		const {
+			Handlers: { requestHandler, errorHandler },
+		} = await import('@sentry/node');
+		app.use(requestHandler());
+		app.use(errorHandler());
+	}
+
+	private setupCommonMiddlewares() {
+		// Compress the response data
+		this.app.use(compression());
+
+		this.app.use(rawBodyReader);
+		this.app.use(bodyParser);
+	}
+
+	private configureRoutes() {
+		this.app.use(
+			this.upgradeEndpoint,
+			// eslint-disable-next-line @typescript-eslint/unbound-method
+			this.taskRunnerAuthController.authMiddleware,
+			(req: TaskRunnerServerInitRequest, res: TaskRunnerServerInitResponse) =>
+				this.taskRunnerService.handleRequest(req, res),
+		);
+
+		const authEndpoint = `${this.getEndpointBasePath()}/auth`;
+		this.app.post(
+			authEndpoint,
+			send(async (req) => await this.taskRunnerAuthController.createGrantToken(req)),
+		);
+	}
+
+	private handleUpgradeRequest = (
+		request: TaskRunnerServerInitRequest,
+		socket: Socket,
+		head: Buffer,
+	) => {
+		if (parseUrl(request.url).pathname !== this.upgradeEndpoint) {
+			socket.write('HTTP/1.1 404 Not Found\r\n\r\n');
+			socket.destroy();
+			return;
+		}
+
+		if (!this.wsServer) {
+			// This might happen if the server is shutting down and we receive an upgrade request
+			socket.write('HTTP/1.1 503 Service Unavailable\r\n\r\n');
+			socket.destroy();
+			return;
+		}
+
+		this.wsServer.handleUpgrade(request, socket, head, (ws) => {
+			request.ws = ws;
+
+			const response = new ServerResponse(request);
+			response.writeHead = (statusCode) => {
+				if (statusCode > 200) ws.close(100);
+				return response;
+			};
+
+			// @ts-expect-error Delegate the request to the express app. This function is not exposed
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+			this.app.handle(request, response);
+		});
+	};
+
+	/** Returns the normalized base path for the task runner endpoints */
+	private getEndpointBasePath() {
+		let path = this.globalConfig.taskRunners.path;
+		if (!path.startsWith('/')) {
+			path = `/${path}`;
+		}
+		if (path.endsWith('/')) {
+			path = path.slice(-1);
+		}
+
+		return path;
+	}
+}
diff --git a/packages/cli/src/scaling/__tests__/publisher.service.test.ts b/packages/cli/src/scaling/__tests__/publisher.service.test.ts
index 311ee0bbb8..05bb52bc6a 100644
--- a/packages/cli/src/scaling/__tests__/publisher.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/publisher.service.test.ts
@@ -3,13 +3,10 @@ import { mock } from 'jest-mock-extended';
 
 import config from '@/config';
 import { generateNanoId } from '@/databases/utils/generators';
-import type {
-	RedisServiceCommandObject,
-	RedisServiceWorkerResponseObject,
-} from '@/scaling/redis/redis-service-commands';
 import type { RedisClientService } from '@/services/redis-client.service';
 
 import { Publisher } from '../pubsub/publisher.service';
+import type { PubSub } from '../pubsub/pubsub.types';
 
 describe('Publisher', () => {
 	let queueModeId: string;
@@ -49,13 +46,13 @@ describe('Publisher', () => {
 	describe('publishCommand', () => {
 		it('should publish command into `n8n.commands` pubsub channel', async () => {
 			const publisher = new Publisher(mock(), redisClientService);
-			const msg = mock<RedisServiceCommandObject>({ command: 'reloadLicense' });
+			const msg = mock<PubSub.Command>({ command: 'reload-license' });
 
 			await publisher.publishCommand(msg);
 
 			expect(client.publish).toHaveBeenCalledWith(
 				'n8n.commands',
-				JSON.stringify({ ...msg, senderId: queueModeId }),
+				JSON.stringify({ ...msg, senderId: queueModeId, selfSend: false, debounce: true }),
 			);
 		});
 	});
@@ -63,8 +60,8 @@ describe('Publisher', () => {
 	describe('publishWorkerResponse', () => {
 		it('should publish worker response into `n8n.worker-response` pubsub channel', async () => {
 			const publisher = new Publisher(mock(), redisClientService);
-			const msg = mock<RedisServiceWorkerResponseObject>({
-				command: 'reloadExternalSecretsProviders',
+			const msg = mock<PubSub.WorkerResponse>({
+				response: 'response-to-get-worker-status',
 			});
 
 			await publisher.publishWorkerResponse(msg);
diff --git a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts
new file mode 100644
index 0000000000..314ded0b8b
--- /dev/null
+++ b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts
@@ -0,0 +1,878 @@
+import type { WorkerStatus } from '@n8n/api-types';
+import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
+import type { Workflow } from 'n8n-workflow';
+
+import type { ActiveWorkflowManager } from '@/active-workflow-manager';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
+import { EventService } from '@/events/event.service';
+import type { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
+import type { IWorkflowDb } from '@/interfaces';
+import type { License } from '@/license';
+import type { Push } from '@/push';
+import type { WebSocketPush } from '@/push/websocket.push';
+import type { CommunityPackagesService } from '@/services/community-packages.service';
+import type { TestWebhooks } from '@/webhooks/test-webhooks';
+
+import type { Publisher } from '../pubsub/publisher.service';
+import { PubSubHandler } from '../pubsub/pubsub-handler';
+import type { WorkerStatusService } from '../worker-status.service';
+
+const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve));
+
+describe('PubSubHandler', () => {
+	const eventService = new EventService();
+	const license = mock<License>();
+	const eventbus = mock<MessageEventBus>();
+	const externalSecretsManager = mock<ExternalSecretsManager>();
+	const communityPackagesService = mock<CommunityPackagesService>();
+	const publisher = mock<Publisher>();
+	const workerStatusService = mock<WorkerStatusService>();
+	const activeWorkflowManager = mock<ActiveWorkflowManager>();
+	const push = mock<Push>();
+	const workflowRepository = mock<WorkflowRepository>();
+	const testWebhooks = mock<TestWebhooks>();
+
+	afterEach(() => {
+		eventService.removeAllListeners();
+	});
+
+	describe('in webhook process', () => {
+		const instanceSettings = mock<InstanceSettings>({ instanceType: 'webhook' });
+
+		it('should set up handlers in webhook process', () => {
+			// @ts-expect-error Spying on private method
+			const setupHandlers = jest.spyOn(PubSubHandler.prototype, 'setupHandlers');
+
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			expect(setupHandlers).toHaveBeenCalledWith({
+				'reload-license': expect.any(Function),
+				'restart-event-bus': expect.any(Function),
+				'reload-external-secrets-providers': expect.any(Function),
+				'community-package-install': expect.any(Function),
+				'community-package-update': expect.any(Function),
+				'community-package-uninstall': expect.any(Function),
+			});
+		});
+
+		it('should reload license on `reload-license` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('reload-license');
+
+			expect(license.reload).toHaveBeenCalled();
+		});
+
+		it('should restart event bus on `restart-event-bus` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('restart-event-bus');
+
+			expect(eventbus.restart).toHaveBeenCalled();
+		});
+
+		it('should reload providers on `reload-external-secrets-providers` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('reload-external-secrets-providers');
+
+			expect(externalSecretsManager.reloadAllProviders).toHaveBeenCalled();
+		});
+
+		it('should install community package on `community-package-install` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-install', {
+				packageName: 'test-package',
+				packageVersion: '1.0.0',
+			});
+
+			expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
+				'test-package',
+				'1.0.0',
+			);
+		});
+
+		it('should update community package on `community-package-update` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-update', {
+				packageName: 'test-package',
+				packageVersion: '1.0.0',
+			});
+
+			expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
+				'test-package',
+				'1.0.0',
+			);
+		});
+
+		it('should uninstall community package on `community-package-uninstall` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-uninstall', {
+				packageName: 'test-package',
+			});
+
+			expect(communityPackagesService.removeNpmPackage).toHaveBeenCalledWith('test-package');
+		});
+	});
+
+	describe('in worker process', () => {
+		const instanceSettings = mock<InstanceSettings>({ instanceType: 'worker' });
+
+		it('should set up handlers in worker process', () => {
+			// @ts-expect-error Spying on private method
+			const setupHandlersSpy = jest.spyOn(PubSubHandler.prototype, 'setupHandlers');
+
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			expect(setupHandlersSpy).toHaveBeenCalledWith({
+				'reload-license': expect.any(Function),
+				'restart-event-bus': expect.any(Function),
+				'reload-external-secrets-providers': expect.any(Function),
+				'community-package-install': expect.any(Function),
+				'community-package-update': expect.any(Function),
+				'community-package-uninstall': expect.any(Function),
+				'get-worker-status': expect.any(Function),
+			});
+		});
+
+		it('should reload license on `reload-license` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('reload-license');
+
+			expect(license.reload).toHaveBeenCalled();
+		});
+
+		it('should restart event bus on `restart-event-bus` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('restart-event-bus');
+
+			expect(eventbus.restart).toHaveBeenCalled();
+		});
+
+		it('should reload providers on `reload-external-secrets-providers` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('reload-external-secrets-providers');
+
+			expect(externalSecretsManager.reloadAllProviders).toHaveBeenCalled();
+		});
+
+		it('should install community package on `community-package-install` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-install', {
+				packageName: 'test-package',
+				packageVersion: '1.0.0',
+			});
+
+			expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
+				'test-package',
+				'1.0.0',
+			);
+		});
+
+		it('should update community package on `community-package-update` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-update', {
+				packageName: 'test-package',
+				packageVersion: '1.0.0',
+			});
+
+			expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
+				'test-package',
+				'1.0.0',
+			);
+		});
+
+		it('should uninstall community package on `community-package-uninstall` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-uninstall', {
+				packageName: 'test-package',
+			});
+
+			expect(communityPackagesService.removeNpmPackage).toHaveBeenCalledWith('test-package');
+		});
+
+		it('should generate status on `get-worker-status` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('get-worker-status');
+
+			expect(workerStatusService.generateStatus).toHaveBeenCalled();
+		});
+	});
+
+	describe('in main process', () => {
+		const instanceSettings = mock<InstanceSettings>({
+			instanceType: 'main',
+			isLeader: true,
+			isFollower: false,
+		});
+
+		afterEach(() => {
+			jest.clearAllMocks();
+		});
+
+		it('should set up command and worker response handlers in main process', () => {
+			// @ts-expect-error Spying on private method
+			const setupHandlersSpy = jest.spyOn(PubSubHandler.prototype, 'setupHandlers');
+
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			expect(setupHandlersSpy).toHaveBeenCalledWith({
+				'reload-license': expect.any(Function),
+				'restart-event-bus': expect.any(Function),
+				'reload-external-secrets-providers': expect.any(Function),
+				'community-package-install': expect.any(Function),
+				'community-package-update': expect.any(Function),
+				'community-package-uninstall': expect.any(Function),
+				'add-webhooks-triggers-and-pollers': expect.any(Function),
+				'remove-triggers-and-pollers': expect.any(Function),
+				'display-workflow-activation': expect.any(Function),
+				'display-workflow-deactivation': expect.any(Function),
+				'display-workflow-activation-error': expect.any(Function),
+				'relay-execution-lifecycle-event': expect.any(Function),
+				'clear-test-webhooks': expect.any(Function),
+				'response-to-get-worker-status': expect.any(Function),
+			});
+		});
+
+		it('should reload license on `reload-license` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('reload-license');
+
+			expect(license.reload).toHaveBeenCalled();
+		});
+
+		it('should restart event bus on `restart-event-bus` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('restart-event-bus');
+
+			expect(eventbus.restart).toHaveBeenCalled();
+		});
+
+		it('should reload providers on `reload-external-secrets-providers` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('reload-external-secrets-providers');
+
+			expect(externalSecretsManager.reloadAllProviders).toHaveBeenCalled();
+		});
+
+		it('should install community package on `community-package-install` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-install', {
+				packageName: 'test-package',
+				packageVersion: '1.0.0',
+			});
+
+			expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
+				'test-package',
+				'1.0.0',
+			);
+		});
+
+		it('should update community package on `community-package-update` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-update', {
+				packageName: 'test-package',
+				packageVersion: '1.0.0',
+			});
+
+			expect(communityPackagesService.installOrUpdateNpmPackage).toHaveBeenCalledWith(
+				'test-package',
+				'1.0.0',
+			);
+		});
+
+		it('should uninstall community package on `community-package-uninstall` event', () => {
+			new PubSubHandler(
+				eventService,
+				instanceSettings,
+				license,
+				eventbus,
+				externalSecretsManager,
+				communityPackagesService,
+				publisher,
+				workerStatusService,
+				activeWorkflowManager,
+				push,
+				workflowRepository,
+				testWebhooks,
+			).init();
+
+			eventService.emit('community-package-uninstall', {
+				packageName: 'test-package',
+			});
+
+			expect(communityPackagesService.removeNpmPackage).toHaveBeenCalledWith('test-package');
+		});
+
+		describe('multi-main setup', () => {
+			it('if leader, should handle `add-webhooks-triggers-and-pollers` event', async () => {
+				new PubSubHandler(
+					eventService,
+					instanceSettings,
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const workflowId = 'test-workflow-id';
+
+				eventService.emit('add-webhooks-triggers-and-pollers', { workflowId });
+
+				await flushPromises();
+
+				expect(activeWorkflowManager.add).toHaveBeenCalledWith(workflowId, 'activate', undefined, {
+					shouldPublish: false,
+				});
+				expect(push.broadcast).toHaveBeenCalledWith('workflowActivated', { workflowId });
+				expect(publisher.publishCommand).toHaveBeenCalledWith({
+					command: 'display-workflow-activation',
+					payload: { workflowId },
+				});
+			});
+
+			it('if follower, should skip `add-webhooks-triggers-and-pollers` event', async () => {
+				new PubSubHandler(
+					eventService,
+					mock<InstanceSettings>({ instanceType: 'main', isLeader: false, isFollower: true }),
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const workflowId = 'test-workflow-id';
+
+				eventService.emit('add-webhooks-triggers-and-pollers', { workflowId });
+
+				await flushPromises();
+
+				expect(activeWorkflowManager.add).not.toHaveBeenCalled();
+				expect(push.broadcast).not.toHaveBeenCalled();
+				expect(publisher.publishCommand).not.toHaveBeenCalled();
+			});
+
+			it('if leader, should handle `remove-triggers-and-pollers` event', async () => {
+				new PubSubHandler(
+					eventService,
+					instanceSettings,
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const workflowId = 'test-workflow-id';
+
+				eventService.emit('remove-triggers-and-pollers', { workflowId });
+
+				await flushPromises();
+
+				expect(activeWorkflowManager.removeActivationError).toHaveBeenCalledWith(workflowId);
+				expect(activeWorkflowManager.removeWorkflowTriggersAndPollers).toHaveBeenCalledWith(
+					workflowId,
+				);
+				expect(push.broadcast).toHaveBeenCalledWith('workflowDeactivated', { workflowId });
+				expect(publisher.publishCommand).toHaveBeenCalledWith({
+					command: 'display-workflow-deactivation',
+					payload: { workflowId },
+				});
+			});
+
+			it('if follower, should skip `remove-triggers-and-pollers` event', async () => {
+				new PubSubHandler(
+					eventService,
+					mock<InstanceSettings>({ instanceType: 'main', isLeader: false, isFollower: true }),
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const workflowId = 'test-workflow-id';
+
+				eventService.emit('remove-triggers-and-pollers', { workflowId });
+
+				await flushPromises();
+
+				expect(activeWorkflowManager.removeActivationError).not.toHaveBeenCalled();
+				expect(activeWorkflowManager.removeWorkflowTriggersAndPollers).not.toHaveBeenCalled();
+				expect(push.broadcast).not.toHaveBeenCalled();
+				expect(publisher.publishCommand).not.toHaveBeenCalled();
+			});
+
+			it('should handle `display-workflow-activation` event', () => {
+				new PubSubHandler(
+					eventService,
+					instanceSettings,
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const workflowId = 'test-workflow-id';
+
+				eventService.emit('display-workflow-activation', { workflowId });
+
+				expect(push.broadcast).toHaveBeenCalledWith('workflowActivated', { workflowId });
+			});
+
+			it('should handle `display-workflow-deactivation` event', () => {
+				new PubSubHandler(
+					eventService,
+					instanceSettings,
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const workflowId = 'test-workflow-id';
+
+				eventService.emit('display-workflow-deactivation', { workflowId });
+
+				expect(push.broadcast).toHaveBeenCalledWith('workflowDeactivated', { workflowId });
+			});
+
+			it('should handle `display-workflow-activation-error` event', () => {
+				new PubSubHandler(
+					eventService,
+					instanceSettings,
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const workflowId = 'test-workflow-id';
+				const errorMessage = 'Test error message';
+
+				eventService.emit('display-workflow-activation-error', { workflowId, errorMessage });
+
+				expect(push.broadcast).toHaveBeenCalledWith('workflowFailedToActivate', {
+					workflowId,
+					errorMessage,
+				});
+			});
+
+			it('should handle `relay-execution-lifecycle-event` event', () => {
+				new PubSubHandler(
+					eventService,
+					instanceSettings,
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const pushRef = 'test-push-ref';
+				const type = 'executionStarted';
+				const args = { testArg: 'value' };
+
+				push.getBackend.mockReturnValue(
+					mock<WebSocketPush>({ hasPushRef: jest.fn().mockReturnValue(true) }),
+				);
+
+				eventService.emit('relay-execution-lifecycle-event', { type, args, pushRef });
+
+				expect(push.send).toHaveBeenCalledWith(type, args, pushRef);
+			});
+
+			it('should handle `clear-test-webhooks` event', () => {
+				new PubSubHandler(
+					eventService,
+					instanceSettings,
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const webhookKey = 'test-webhook-key';
+				const workflowEntity = mock<IWorkflowDb>({ id: 'test-workflow-id' });
+				const pushRef = 'test-push-ref';
+
+				push.getBackend.mockReturnValue(
+					mock<WebSocketPush>({ hasPushRef: jest.fn().mockReturnValue(true) }),
+				);
+				testWebhooks.toWorkflow.mockReturnValue(mock<Workflow>({ id: 'test-workflow-id' }));
+
+				eventService.emit('clear-test-webhooks', { webhookKey, workflowEntity, pushRef });
+
+				expect(testWebhooks.clearTimeout).toHaveBeenCalledWith(webhookKey);
+				expect(testWebhooks.deactivateWebhooks).toHaveBeenCalled();
+			});
+
+			it('should handle `response-to-get-worker-status event', () => {
+				new PubSubHandler(
+					eventService,
+					instanceSettings,
+					license,
+					eventbus,
+					externalSecretsManager,
+					communityPackagesService,
+					publisher,
+					workerStatusService,
+					activeWorkflowManager,
+					push,
+					workflowRepository,
+					testWebhooks,
+				).init();
+
+				const workerStatus = mock<WorkerStatus>({ senderId: 'worker-1', loadAvg: [123] });
+
+				eventService.emit('response-to-get-worker-status', workerStatus);
+
+				expect(push.broadcast).toHaveBeenCalledWith('sendWorkerStatusMessage', {
+					workerId: workerStatus.senderId,
+					status: workerStatus,
+				});
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
index 9beae22af6..a6c14ab964 100644
--- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -6,12 +6,12 @@ import { ApplicationError } from 'n8n-workflow';
 import Container from 'typedi';
 
 import type { OrchestrationService } from '@/services/orchestration.service';
-import { mockInstance } from '@test/mocking';
+import { mockInstance, mockLogger } from '@test/mocking';
 
 import { JOB_TYPE_NAME, QUEUE_NAME } from '../constants';
 import type { JobProcessor } from '../job-processor';
 import { ScalingService } from '../scaling.service';
-import type { Job, JobData, JobOptions, JobQueue } from '../scaling.types';
+import type { Job, JobData, JobQueue } from '../scaling.types';
 
 const queue = mock<JobQueue>({
 	client: { ping: jest.fn() },
@@ -74,7 +74,7 @@ describe('ScalingService', () => {
 		instanceSettings.markAsLeader();
 
 		scalingService = new ScalingService(
-			mock(),
+			mockLogger(),
 			mock(),
 			jobProcessor,
 			globalConfig,
@@ -208,10 +208,13 @@ describe('ScalingService', () => {
 			queue.add.mockResolvedValue(mock<Job>({ id: '456' }));
 
 			const jobData = mock<JobData>({ executionId: '123' });
-			const jobOptions = mock<JobOptions>();
-			await scalingService.addJob(jobData, jobOptions);
+			await scalingService.addJob(jobData, { priority: 100 });
 
-			expect(queue.add).toHaveBeenCalledWith(JOB_TYPE_NAME, jobData, jobOptions);
+			expect(queue.add).toHaveBeenCalledWith(JOB_TYPE_NAME, jobData, {
+				priority: 100,
+				removeOnComplete: true,
+				removeOnFail: true,
+			});
 		});
 	});
 
diff --git a/packages/cli/src/scaling/__tests__/subscriber.service.test.ts b/packages/cli/src/scaling/__tests__/subscriber.service.test.ts
index 14e67a8d4d..62834dba33 100644
--- a/packages/cli/src/scaling/__tests__/subscriber.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/subscriber.service.test.ts
@@ -17,14 +17,14 @@ describe('Subscriber', () => {
 
 	describe('constructor', () => {
 		it('should init Redis client in scaling mode', () => {
-			const subscriber = new Subscriber(mock(), redisClientService);
+			const subscriber = new Subscriber(mock(), redisClientService, mock());
 
 			expect(subscriber.getClient()).toEqual(client);
 		});
 
 		it('should not init Redis client in regular mode', () => {
 			config.set('executions.mode', 'regular');
-			const subscriber = new Subscriber(mock(), redisClientService);
+			const subscriber = new Subscriber(mock(), redisClientService, mock());
 
 			expect(subscriber.getClient()).toBeUndefined();
 		});
@@ -32,7 +32,7 @@ describe('Subscriber', () => {
 
 	describe('shutdown', () => {
 		it('should disconnect Redis client', () => {
-			const subscriber = new Subscriber(mock(), redisClientService);
+			const subscriber = new Subscriber(mock(), redisClientService, mock());
 			subscriber.shutdown();
 			expect(client.disconnect).toHaveBeenCalled();
 		});
@@ -40,24 +40,11 @@ describe('Subscriber', () => {
 
 	describe('subscribe', () => {
 		it('should subscribe to pubsub channel', async () => {
-			const subscriber = new Subscriber(mock(), redisClientService);
+			const subscriber = new Subscriber(mock(), redisClientService, mock());
 
 			await subscriber.subscribe('n8n.commands');
 
 			expect(client.subscribe).toHaveBeenCalledWith('n8n.commands', expect.any(Function));
 		});
 	});
-
-	describe('setMessageHandler', () => {
-		it('should set message handler function for channel', () => {
-			const subscriber = new Subscriber(mock(), redisClientService);
-			const channel = 'n8n.commands';
-			const handlerFn = jest.fn();
-
-			subscriber.setMessageHandler(channel, handlerFn);
-
-			// @ts-expect-error Private field
-			expect(subscriber.handlers).toEqual(new Map([[channel, handlerFn]]));
-		});
-	});
 });
diff --git a/packages/cli/src/scaling/__tests__/worker-server.test.ts b/packages/cli/src/scaling/__tests__/worker-server.test.ts
index d5716bfac4..778d403bf2 100644
--- a/packages/cli/src/scaling/__tests__/worker-server.test.ts
+++ b/packages/cli/src/scaling/__tests__/worker-server.test.ts
@@ -5,7 +5,6 @@ import type { InstanceSettings } from 'n8n-core';
 import { AssertionError } from 'node:assert';
 import * as http from 'node:http';
 
-import { PortTakenError } from '@/errors/port-taken.error';
 import type { ExternalHooks } from '@/external-hooks';
 import type { PrometheusMetricsService } from '@/metrics/prometheus-metrics.service';
 import { bodyParser, rawBodyReader } from '@/middlewares';
@@ -34,7 +33,7 @@ describe('WorkerServer', () => {
 	beforeEach(() => {
 		globalConfig = mock<GlobalConfig>({
 			queue: {
-				health: { active: true, port: 5678 },
+				health: { active: true, port: 5678, address: '0.0.0.0' },
 			},
 			credentials: {
 				overwrite: { endpoint: '' },
@@ -51,16 +50,19 @@ describe('WorkerServer', () => {
 						globalConfig,
 						mock(),
 						mock(),
-						mock(),
 						externalHooks,
 						mock<InstanceSettings>({ instanceType: 'webhook' }),
 						prometheusMetricsService,
+						mock(),
 					),
 			).toThrowError(AssertionError);
 		});
 
-		it('should throw if port taken', async () => {
+		it('should exit if port taken', async () => {
 			const server = mock<http.Server>();
+			const procesExitSpy = jest
+				.spyOn(process, 'exit')
+				.mockImplementation(() => undefined as never);
 
 			jest.spyOn(http, 'createServer').mockReturnValue(server);
 
@@ -69,18 +71,19 @@ describe('WorkerServer', () => {
 				return server;
 			});
 
-			expect(
-				() =>
-					new WorkerServer(
-						globalConfig,
-						mock(),
-						mock(),
-						mock(),
-						externalHooks,
-						instanceSettings,
-						prometheusMetricsService,
-					),
-			).toThrowError(PortTakenError);
+			new WorkerServer(
+				globalConfig,
+				mock(),
+				mock(),
+				externalHooks,
+				instanceSettings,
+				prometheusMetricsService,
+				mock(),
+			);
+
+			expect(procesExitSpy).toHaveBeenCalledWith(1);
+
+			procesExitSpy.mockRestore();
 		});
 	});
 
@@ -89,8 +92,9 @@ describe('WorkerServer', () => {
 			const server = mock<http.Server>();
 			jest.spyOn(http, 'createServer').mockReturnValue(server);
 
-			server.listen.mockImplementation((_port, callback: () => void) => {
-				callback();
+			server.listen.mockImplementation((...args: unknown[]) => {
+				const callback = args.find((arg) => typeof arg === 'function');
+				if (callback) callback();
 				return server;
 			});
 
@@ -98,10 +102,10 @@ describe('WorkerServer', () => {
 				globalConfig,
 				mock(),
 				mock(),
-				mock(),
 				externalHooks,
 				instanceSettings,
 				prometheusMetricsService,
+				mock(),
 			);
 
 			const CREDENTIALS_OVERWRITE_ENDPOINT = 'credentials/overwrites';
@@ -123,8 +127,9 @@ describe('WorkerServer', () => {
 			const server = mock<http.Server>();
 			jest.spyOn(http, 'createServer').mockReturnValue(server);
 
-			server.listen.mockImplementation((_port, callback: () => void) => {
-				callback();
+			server.listen.mockImplementation((...args: unknown[]) => {
+				const callback = args.find((arg) => typeof arg === 'function');
+				if (callback) callback();
 				return server;
 			});
 
@@ -132,10 +137,10 @@ describe('WorkerServer', () => {
 				globalConfig,
 				mock(),
 				mock(),
-				mock(),
 				externalHooks,
 				instanceSettings,
 				prometheusMetricsService,
+				mock(),
 			);
 
 			await workerServer.init({ health: true, overwrites: false, metrics: true });
@@ -153,10 +158,10 @@ describe('WorkerServer', () => {
 				globalConfig,
 				mock(),
 				mock(),
-				mock(),
 				externalHooks,
 				instanceSettings,
 				prometheusMetricsService,
+				mock(),
 			);
 			await expect(
 				workerServer.init({ health: false, overwrites: false, metrics: false }),
@@ -171,14 +176,15 @@ describe('WorkerServer', () => {
 				globalConfig,
 				mock(),
 				mock(),
-				mock(),
 				externalHooks,
 				instanceSettings,
 				prometheusMetricsService,
+				mock(),
 			);
 
-			server.listen.mockImplementation((_port, callback: () => void) => {
-				callback();
+			server.listen.mockImplementation((...args: unknown[]) => {
+				const callback = args.find((arg) => typeof arg === 'function');
+				if (callback) callback();
 				return server;
 			});
 
diff --git a/packages/cli/src/scaling/constants.ts b/packages/cli/src/scaling/constants.ts
index f1e55d7ab1..348f156896 100644
--- a/packages/cli/src/scaling/constants.ts
+++ b/packages/cli/src/scaling/constants.ts
@@ -7,3 +7,17 @@ export const COMMAND_PUBSUB_CHANNEL = 'n8n.commands';
 
 /** Pubsub channel for messages sent by workers in response to commands from main processes. */
 export const WORKER_RESPONSE_PUBSUB_CHANNEL = 'n8n.worker-response';
+
+/**
+ * Commands that should be sent to the sender as well, e.g. during workflow activation and
+ * deactivation in multi-main setup. */
+export const SELF_SEND_COMMANDS = new Set([
+	'add-webhooks-triggers-and-pollers',
+	'remove-triggers-and-pollers',
+]);
+
+/**
+ * Commands that should not be debounced when received, e.g. during webhook handling in
+ * multi-main setup.
+ */
+export const IMMEDIATE_COMMANDS = new Set(['relay-execution-lifecycle-event']);
diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts
index 3155b0d90f..49e1383ac6 100644
--- a/packages/cli/src/scaling/job-processor.ts
+++ b/packages/cli/src/scaling/job-processor.ts
@@ -8,7 +8,7 @@ import { Service } from 'typedi';
 import config from '@/config';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
@@ -47,7 +47,7 @@ export class JobProcessor {
 
 		this.logger.info(`[JobProcessor] Starting job ${job.id} (execution ${executionId})`);
 
-		await this.executionRepository.updateStatus(executionId, 'running');
+		const startedAt = await this.executionRepository.setRunning(executionId);
 
 		let { staticData } = execution.workflowData;
 
@@ -137,7 +137,7 @@ export class JobProcessor {
 			workflowId: execution.workflowId,
 			workflowName: execution.workflowData.name,
 			mode: execution.mode,
-			startedAt: execution.startedAt,
+			startedAt,
 			retryOf: execution.retryOf ?? '',
 			status: execution.status,
 		};
diff --git a/packages/cli/src/scaling/pubsub/publisher.service.ts b/packages/cli/src/scaling/pubsub/publisher.service.ts
index 1f13ef9896..29d31989ff 100644
--- a/packages/cli/src/scaling/pubsub/publisher.service.ts
+++ b/packages/cli/src/scaling/pubsub/publisher.service.ts
@@ -2,13 +2,12 @@ import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'iore
 import { Service } from 'typedi';
 
 import config from '@/config';
-import { Logger } from '@/logger';
-import type {
-	RedisServiceCommandObject,
-	RedisServiceWorkerResponseObject,
-} from '@/scaling/redis/redis-service-commands';
+import { Logger } from '@/logging/logger.service';
 import { RedisClientService } from '@/services/redis-client.service';
 
+import type { PubSub } from './pubsub.types';
+import { IMMEDIATE_COMMANDS, SELF_SEND_COMMANDS } from '../constants';
+
 /**
  * Responsible for publishing messages into the pubsub channels used by scaling mode.
  */
@@ -26,8 +25,6 @@ export class Publisher {
 		if (config.getEnv('executions.mode') !== 'queue') return;
 
 		this.client = this.redisClientService.createClient({ type: 'publisher(n8n)' });
-
-		this.client.on('error', (error) => this.logger.error(error.message));
 	}
 
 	getClient() {
@@ -44,20 +41,25 @@ export class Publisher {
 	// #region Publishing
 
 	/** Publish a command into the `n8n.commands` channel. */
-	async publishCommand(msg: Omit<RedisServiceCommandObject, 'senderId'>) {
+	async publishCommand(msg: Omit<PubSub.Command, 'senderId'>) {
 		await this.client.publish(
 			'n8n.commands',
-			JSON.stringify({ ...msg, senderId: config.getEnv('redis.queueModeId') }),
+			JSON.stringify({
+				...msg,
+				senderId: config.getEnv('redis.queueModeId'),
+				selfSend: SELF_SEND_COMMANDS.has(msg.command),
+				debounce: !IMMEDIATE_COMMANDS.has(msg.command),
+			}),
 		);
 
 		this.logger.debug(`Published ${msg.command} to command channel`);
 	}
 
 	/** Publish a response for a command into the `n8n.worker-response` channel. */
-	async publishWorkerResponse(msg: RedisServiceWorkerResponseObject) {
+	async publishWorkerResponse(msg: PubSub.WorkerResponse) {
 		await this.client.publish('n8n.worker-response', JSON.stringify(msg));
 
-		this.logger.debug(`Published response for ${msg.command} to worker response channel`);
+		this.logger.debug(`Published response ${msg.response} to worker response channel`);
 	}
 
 	// #endregion
diff --git a/packages/cli/src/scaling/pubsub/pubsub-handler.ts b/packages/cli/src/scaling/pubsub/pubsub-handler.ts
new file mode 100644
index 0000000000..ca590dd2c2
--- /dev/null
+++ b/packages/cli/src/scaling/pubsub/pubsub-handler.ts
@@ -0,0 +1,172 @@
+import { InstanceSettings } from 'n8n-core';
+import { ensureError } from 'n8n-workflow';
+import { Service } from 'typedi';
+
+import { ActiveWorkflowManager } from '@/active-workflow-manager';
+import config from '@/config';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
+import { EventService } from '@/events/event.service';
+import type { PubSubEventMap } from '@/events/maps/pub-sub.event-map';
+import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
+import { License } from '@/license';
+import { Push } from '@/push';
+import { Publisher } from '@/scaling/pubsub/publisher.service';
+import { CommunityPackagesService } from '@/services/community-packages.service';
+import { assertNever } from '@/utils';
+import { TestWebhooks } from '@/webhooks/test-webhooks';
+
+import type { PubSub } from './pubsub.types';
+import { WorkerStatusService } from '../worker-status.service';
+
+/**
+ * Responsible for handling events emitted from messages received via a pubsub channel.
+ */
+@Service()
+export class PubSubHandler {
+	constructor(
+		private readonly eventService: EventService,
+		private readonly instanceSettings: InstanceSettings,
+		private readonly license: License,
+		private readonly eventbus: MessageEventBus,
+		private readonly externalSecretsManager: ExternalSecretsManager,
+		private readonly communityPackagesService: CommunityPackagesService,
+		private readonly publisher: Publisher,
+		private readonly workerStatusService: WorkerStatusService,
+		private readonly activeWorkflowManager: ActiveWorkflowManager,
+		private readonly push: Push,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly testWebhooks: TestWebhooks,
+	) {}
+
+	init() {
+		switch (this.instanceSettings.instanceType) {
+			case 'webhook':
+				this.setupHandlers(this.commonHandlers);
+				break;
+			case 'worker':
+				this.setupHandlers({
+					...this.commonHandlers,
+					'get-worker-status': async () =>
+						await this.publisher.publishWorkerResponse({
+							senderId: config.getEnv('redis.queueModeId'),
+							response: 'response-to-get-worker-status',
+							payload: this.workerStatusService.generateStatus(),
+						}),
+				});
+				break;
+			case 'main':
+				this.setupHandlers({
+					...this.commonHandlers,
+					...this.multiMainHandlers,
+					'response-to-get-worker-status': async (payload) =>
+						this.push.broadcast('sendWorkerStatusMessage', {
+							workerId: payload.senderId,
+							status: payload,
+						}),
+				});
+
+				break;
+			default:
+				assertNever(this.instanceSettings.instanceType);
+		}
+	}
+
+	private setupHandlers<EventNames extends keyof PubSubEventMap>(
+		map: {
+			[EventName in EventNames]?: (event: PubSubEventMap[EventName]) => void | Promise<void>;
+		},
+	) {
+		for (const [eventName, handlerFn] of Object.entries(map) as Array<
+			[EventNames, (event: PubSubEventMap[EventNames]) => void | Promise<void>]
+		>) {
+			this.eventService.on(eventName, async (event) => {
+				await handlerFn(event);
+			});
+		}
+	}
+
+	private commonHandlers: {
+		[EventName in keyof PubSub.CommonEvents]: (event: PubSubEventMap[EventName]) => Promise<void>;
+	} = {
+		'reload-license': async () => await this.license.reload(),
+		'restart-event-bus': async () => await this.eventbus.restart(),
+		'reload-external-secrets-providers': async () =>
+			await this.externalSecretsManager.reloadAllProviders(),
+		'community-package-install': async ({ packageName, packageVersion }) =>
+			await this.communityPackagesService.installOrUpdateNpmPackage(packageName, packageVersion),
+		'community-package-update': async ({ packageName, packageVersion }) =>
+			await this.communityPackagesService.installOrUpdateNpmPackage(packageName, packageVersion),
+		'community-package-uninstall': async ({ packageName }) =>
+			await this.communityPackagesService.removeNpmPackage(packageName),
+	};
+
+	private multiMainHandlers: {
+		[EventName in keyof PubSub.MultiMainEvents]: (
+			event: PubSubEventMap[EventName],
+		) => Promise<void>;
+	} = {
+		'add-webhooks-triggers-and-pollers': async ({ workflowId }) => {
+			if (this.instanceSettings.isFollower) return;
+
+			try {
+				await this.activeWorkflowManager.add(workflowId, 'activate', undefined, {
+					shouldPublish: false, // prevent leader from re-publishing message
+				});
+
+				this.push.broadcast('workflowActivated', { workflowId });
+
+				await this.publisher.publishCommand({
+					command: 'display-workflow-activation',
+					payload: { workflowId },
+				}); // instruct followers to show activation in UI
+			} catch (e) {
+				const error = ensureError(e);
+				const { message } = error;
+
+				await this.workflowRepository.update(workflowId, { active: false });
+
+				this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage: message });
+
+				await this.publisher.publishCommand({
+					command: 'display-workflow-activation-error',
+					payload: { workflowId, errorMessage: message },
+				}); // instruct followers to show activation error in UI
+			}
+		},
+		'remove-triggers-and-pollers': async ({ workflowId }) => {
+			if (this.instanceSettings.isFollower) return;
+
+			await this.activeWorkflowManager.removeActivationError(workflowId);
+			await this.activeWorkflowManager.removeWorkflowTriggersAndPollers(workflowId);
+
+			this.push.broadcast('workflowDeactivated', { workflowId });
+
+			// instruct followers to show workflow deactivation in UI
+			await this.publisher.publishCommand({
+				command: 'display-workflow-deactivation',
+				payload: { workflowId },
+			});
+		},
+		'display-workflow-activation': async ({ workflowId }) =>
+			this.push.broadcast('workflowActivated', { workflowId }),
+		'display-workflow-deactivation': async ({ workflowId }) =>
+			this.push.broadcast('workflowDeactivated', { workflowId }),
+		'display-workflow-activation-error': async ({ workflowId, errorMessage }) =>
+			this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage }),
+		'relay-execution-lifecycle-event': async ({ type, args, pushRef }) => {
+			if (!this.push.getBackend().hasPushRef(pushRef)) return;
+
+			this.push.send(type, args, pushRef);
+		},
+		'clear-test-webhooks': async ({ webhookKey, workflowEntity, pushRef }) => {
+			if (!this.push.getBackend().hasPushRef(pushRef)) return;
+
+			this.testWebhooks.clearTimeout(webhookKey);
+
+			const workflow = this.testWebhooks.toWorkflow(workflowEntity);
+
+			await this.testWebhooks.deactivateWebhooks(workflow);
+		},
+	};
+}
diff --git a/packages/cli/src/scaling/pubsub/pubsub.types.ts b/packages/cli/src/scaling/pubsub/pubsub.types.ts
index 191f4b62d9..b4d6e1a962 100644
--- a/packages/cli/src/scaling/pubsub/pubsub.types.ts
+++ b/packages/cli/src/scaling/pubsub/pubsub.types.ts
@@ -1,96 +1,129 @@
-import type { PushType, WorkerStatus } from '@n8n/api-types';
-
-import type { IWorkflowDb } from '@/interfaces';
+import type {
+	PubSubCommandMap,
+	PubSubEventMap,
+	PubSubWorkerResponseMap,
+} from '@/events/maps/pub-sub.event-map';
+import type { Resolve } from '@/utlity.types';
 
 import type { COMMAND_PUBSUB_CHANNEL, WORKER_RESPONSE_PUBSUB_CHANNEL } from '../constants';
 
-/** Pubsub channel used by scaling mode. */
-export type PubSubChannel = typeof COMMAND_PUBSUB_CHANNEL | typeof WORKER_RESPONSE_PUBSUB_CHANNEL;
+export namespace PubSub {
+	// ----------------------------------
+	//             channels
+	// ----------------------------------
 
-/** Handler function for every message received via a `PubSubChannel`. */
-export type PubSubHandlerFn = (msg: string) => void;
+	/** Pubsub channel used by scaling mode. */
+	export type Channel = typeof COMMAND_PUBSUB_CHANNEL | typeof WORKER_RESPONSE_PUBSUB_CHANNEL;
 
-export type PubSubMessageMap = {
-	// #region Lifecycle
+	/** Handler function for every message received via a pubsub channel. */
+	export type HandlerFn = (msg: string) => void;
 
-	'reload-license': never;
+	// ----------------------------------
+	//            commands
+	// ----------------------------------
 
-	'restart-event-bus': {
-		result: 'success' | 'error';
-		error?: string;
-	};
+	type _ToCommand<CommandKey extends keyof PubSubCommandMap> = {
+		senderId: string;
+		targets?: string[];
+		command: CommandKey;
 
-	'reload-external-secrets-providers': {
-		result: 'success' | 'error';
-		error?: string;
-	};
+		/** Whether the command should be sent to the sender as well. */
+		selfSend?: boolean;
 
-	'stop-worker': never;
+		/** Whether the command should be debounced when received. */
+		debounce?: boolean;
+	} & (PubSubCommandMap[CommandKey] extends never
+		? { payload?: never } // some commands carry no payload
+		: { payload: PubSubCommandMap[CommandKey] });
 
-	// #endregion
+	type ToCommand<CommandKey extends keyof PubSubCommandMap> = Resolve<_ToCommand<CommandKey>>;
 
-	// #region Community packages
+	namespace Commands {
+		export type ReloadLicense = ToCommand<'reload-license'>;
+		export type RestartEventBus = ToCommand<'restart-event-bus'>;
+		export type ReloadExternalSecretsProviders = ToCommand<'reload-external-secrets-providers'>;
+		export type CommunityPackageInstall = ToCommand<'community-package-install'>;
+		export type CommunityPackageUpdate = ToCommand<'community-package-update'>;
+		export type CommunityPackageUninstall = ToCommand<'community-package-uninstall'>;
+		export type GetWorkerId = ToCommand<'get-worker-id'>;
+		export type GetWorkerStatus = ToCommand<'get-worker-status'>;
+		export type AddWebhooksTriggersAndPollers = ToCommand<'add-webhooks-triggers-and-pollers'>;
+		export type RemoveTriggersAndPollers = ToCommand<'remove-triggers-and-pollers'>;
+		export type DisplayWorkflowActivation = ToCommand<'display-workflow-activation'>;
+		export type DisplayWorkflowDeactivation = ToCommand<'display-workflow-deactivation'>;
+		export type DisplayWorkflowActivationError = ToCommand<'display-workflow-activation-error'>;
+		export type RelayExecutionLifecycleEvent = ToCommand<'relay-execution-lifecycle-event'>;
+		export type ClearTestWebhooks = ToCommand<'clear-test-webhooks'>;
+	}
 
-	'community-package-install': {
-		packageName: string;
-		packageVersion: string;
-	};
+	/** Command sent via the `n8n.commands` pubsub channel. */
+	export type Command =
+		| Commands.ReloadLicense
+		| Commands.RestartEventBus
+		| Commands.ReloadExternalSecretsProviders
+		| Commands.CommunityPackageInstall
+		| Commands.CommunityPackageUpdate
+		| Commands.CommunityPackageUninstall
+		| Commands.GetWorkerId
+		| Commands.GetWorkerStatus
+		| Commands.AddWebhooksTriggersAndPollers
+		| Commands.RemoveTriggersAndPollers
+		| Commands.DisplayWorkflowActivation
+		| Commands.DisplayWorkflowDeactivation
+		| Commands.DisplayWorkflowActivationError
+		| Commands.RelayExecutionLifecycleEvent
+		| Commands.ClearTestWebhooks;
 
-	'community-package-update': {
-		packageName: string;
-		packageVersion: string;
-	};
+	// ----------------------------------
+	//         worker responses
+	// ----------------------------------
 
-	'community-package-uninstall': {
-		packageName: string;
-		packageVersion: string;
-	};
+	type _ToWorkerResponse<WorkerResponseKey extends keyof PubSubWorkerResponseMap> = {
+		/** ID of worker sending the response. */
+		senderId: string;
 
-	// #endregion
+		/** IDs of processes to send the response to. */
+		targets?: string[];
 
-	// #region Worker view
+		/** Content of worker response. */
+		response: WorkerResponseKey;
 
-	'get-worker-id': never;
+		/** Whether the command should be debounced when received. */
+		debounce?: boolean;
+	} & (PubSubWorkerResponseMap[WorkerResponseKey] extends never
+		? { payload?: never } // some responses carry no payload
+		: { payload: PubSubWorkerResponseMap[WorkerResponseKey] });
 
-	'get-worker-status': WorkerStatus;
+	type ToWorkerResponse<WorkerResponseKey extends keyof PubSubWorkerResponseMap> = Resolve<
+		_ToWorkerResponse<WorkerResponseKey>
+	>;
 
-	// #endregion
+	/** Response sent via the `n8n.worker-response` pubsub channel. */
+	export type WorkerResponse = ToWorkerResponse<'response-to-get-worker-status'>;
 
-	// #region Multi-main setup
+	/**
+	 * Of all events emitted from pubsub messages, those whose handlers
+	 * are all present in main, worker, and webhook processes.
+	 */
+	export type CommonEvents = Pick<
+		PubSubEventMap,
+		| 'reload-license'
+		| 'restart-event-bus'
+		| 'reload-external-secrets-providers'
+		| 'community-package-install'
+		| 'community-package-update'
+		| 'community-package-uninstall'
+	>;
 
-	'add-webhooks-triggers-and-pollers': {
-		workflowId: string;
-	};
-
-	'remove-triggers-and-pollers': {
-		workflowId: string;
-	};
-
-	'display-workflow-activation': {
-		workflowId: string;
-	};
-
-	'display-workflow-deactivation': {
-		workflowId: string;
-	};
-
-	// currently 'workflow-failed-to-activate'
-	'display-workflow-activation-error': {
-		workflowId: string;
-		errorMessage: string;
-	};
-
-	'relay-execution-lifecycle-event': {
-		type: PushType;
-		args: Record<string, unknown>;
-		pushRef: string;
-	};
-
-	'clear-test-webhooks': {
-		webhookKey: string;
-		workflowEntity: IWorkflowDb;
-		pushRef: string;
-	};
-
-	// #endregion
-};
+	/** Multi-main events emitted from pubsub messages. */
+	export type MultiMainEvents = Pick<
+		PubSubEventMap,
+		| 'add-webhooks-triggers-and-pollers'
+		| 'remove-triggers-and-pollers'
+		| 'display-workflow-activation'
+		| 'display-workflow-deactivation'
+		| 'display-workflow-activation-error'
+		| 'relay-execution-lifecycle-event'
+		| 'clear-test-webhooks'
+	>;
+}
diff --git a/packages/cli/src/scaling/pubsub/subscriber.service.ts b/packages/cli/src/scaling/pubsub/subscriber.service.ts
index 5d4529fdb9..7c7f90fb0e 100644
--- a/packages/cli/src/scaling/pubsub/subscriber.service.ts
+++ b/packages/cli/src/scaling/pubsub/subscriber.service.ts
@@ -1,11 +1,14 @@
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
+import debounce from 'lodash/debounce';
+import { jsonParse } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import config from '@/config';
-import { Logger } from '@/logger';
+import { EventService } from '@/events/event.service';
+import { Logger } from '@/logging/logger.service';
 import { RedisClientService } from '@/services/redis-client.service';
 
-import type { PubSubHandlerFn, PubSubChannel } from './pubsub.types';
+import type { PubSub } from './pubsub.types';
 
 /**
  * Responsible for subscribing to the pubsub channels used by scaling mode.
@@ -14,23 +17,30 @@ import type { PubSubHandlerFn, PubSubChannel } from './pubsub.types';
 export class Subscriber {
 	private readonly client: SingleNodeClient | MultiNodeClient;
 
-	private readonly handlers: Map<PubSubChannel, PubSubHandlerFn> = new Map();
-
 	// #region Lifecycle
 
 	constructor(
 		private readonly logger: Logger,
 		private readonly redisClientService: RedisClientService,
+		private readonly eventService: EventService,
 	) {
 		// @TODO: Once this class is only ever initialized in scaling mode, throw in the next line instead.
 		if (config.getEnv('executions.mode') !== 'queue') return;
 
 		this.client = this.redisClientService.createClient({ type: 'subscriber(n8n)' });
 
-		this.client.on('error', (error) => this.logger.error(error.message));
+		const handlerFn = (msg: PubSub.Command | PubSub.WorkerResponse) => {
+			const eventName = 'command' in msg ? msg.command : msg.response;
+			this.eventService.emit(eventName, msg.payload);
+		};
 
-		this.client.on('message', (channel: PubSubChannel, message) => {
-			this.handlers.get(channel)?.(message);
+		const debouncedHandlerFn = debounce(handlerFn, 300);
+
+		this.client.on('message', (_channel: PubSub.Channel, str) => {
+			const msg = this.parseMessage(str);
+			if (!msg) return;
+			if (msg.debounce) debouncedHandlerFn(msg);
+			else handlerFn(msg);
 		});
 	}
 
@@ -47,7 +57,7 @@ export class Subscriber {
 
 	// #region Subscribing
 
-	async subscribe(channel: PubSubChannel) {
+	async subscribe(channel: PubSub.Channel) {
 		await this.client.subscribe(channel, (error) => {
 			if (error) {
 				this.logger.error('Failed to subscribe to channel', { channel, cause: error });
@@ -58,9 +68,32 @@ export class Subscriber {
 		});
 	}
 
-	/** Set the message handler function for a channel. */
-	setMessageHandler(channel: PubSubChannel, handlerFn: PubSubHandlerFn) {
-		this.handlers.set(channel, handlerFn);
+	// #region Commands
+
+	private parseMessage(str: string) {
+		const msg = jsonParse<PubSub.Command | PubSub.WorkerResponse | null>(str, {
+			fallbackValue: null,
+		});
+
+		if (!msg) {
+			this.logger.debug('Received invalid string via pubsub channel', { message: str });
+
+			return null;
+		}
+
+		const queueModeId = config.getEnv('redis.queueModeId');
+
+		if (
+			'command' in msg &&
+			!msg.selfSend &&
+			(msg.senderId === queueModeId || (msg.targets && !msg.targets.includes(queueModeId)))
+		) {
+			return null;
+		}
+
+		this.logger.debug('Received message via pubsub channel', msg);
+
+		return msg;
 	}
 
 	// #endregion
diff --git a/packages/cli/src/scaling/redis/redis-service-commands.ts b/packages/cli/src/scaling/redis/redis-service-commands.ts
deleted file mode 100644
index e64d1e97fc..0000000000
--- a/packages/cli/src/scaling/redis/redis-service-commands.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import type { PushType, WorkerStatus } from '@n8n/api-types';
-
-import type { IWorkflowDb } from '@/interfaces';
-
-export type RedisServiceCommand =
-	| 'getStatus'
-	| 'getId'
-	| 'restartEventBus'
-	| '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
-	| 'remove-triggers-and-pollers' // multi-main only
-	| 'workflow-failed-to-activate' // multi-main only
-	| 'relay-execution-lifecycle-event' // multi-main only
-	| 'clear-test-webhooks'; // multi-main only
-
-/**
- * An object to be sent via Redis pubsub from the main process to the workers.
- * @field command: The command to be executed.
- * @field targets: The targets to execute the command on. Leave empty to execute on all workers or specify worker ids.
- * @field payload: Optional arguments to be sent with the command.
- */
-export type RedisServiceBaseCommand =
-	| {
-			senderId: string;
-			command: Exclude<
-				RedisServiceCommand,
-				| '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[];
-			};
-	  }
-	| {
-			senderId: string;
-			command: 'relay-execution-lifecycle-event';
-			payload: { type: PushType; args: Record<string, unknown>; pushRef: string };
-	  }
-	| {
-			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 = {
-	workerId: string;
-} & (
-	| RedisServiceBaseCommand
-	| {
-			command: 'getStatus';
-			payload: WorkerStatus;
-	  }
-	| {
-			command: 'getId';
-	  }
-	| {
-			command: 'restartEventBus';
-			payload: {
-				result: 'success' | 'error';
-				error?: string;
-			};
-	  }
-	| {
-			command: 'reloadExternalSecretsProviders';
-			payload: {
-				result: 'success' | 'error';
-				error?: string;
-			};
-	  }
-	| {
-			command: 'stopWorker';
-	  }
-	| {
-			command: 'workflowActiveStateChanged';
-			payload: {
-				oldState: boolean;
-				newState: boolean;
-				workflowId: string;
-			};
-	  }
-) & { targets?: string[] };
-
-export type RedisServiceCommandObject = {
-	targets?: string[];
-} & RedisServiceBaseCommand;
diff --git a/packages/cli/src/scaling/redis/redis.types.ts b/packages/cli/src/scaling/redis/redis.types.ts
index ed694904d7..ec7f2397fa 100644
--- a/packages/cli/src/scaling/redis/redis.types.ts
+++ b/packages/cli/src/scaling/redis/redis.types.ts
@@ -3,8 +3,8 @@ export type RedisClientType = N8nRedisClientType | BullRedisClientType;
 /**
  * Redis client used by n8n.
  *
- * - `subscriber(n8n)` to listen for messages from scaling mode communication channels
- * - `publisher(n8n)` to send messages into scaling mode communication channels
+ * - `subscriber(n8n)` to listen for messages from scaling mode pubsub channels
+ * - `publisher(n8n)` to send messages into scaling mode pubsub channels
  * - `cache(n8n)` for caching operations (variables, resource ownership, etc.)
  */
 type N8nRedisClientType = 'subscriber(n8n)' | 'publisher(n8n)' | 'cache(n8n)';
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index 552802ba70..f35b4348a6 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -1,7 +1,14 @@
 import { GlobalConfig } from '@n8n/config';
 import { InstanceSettings } from 'n8n-core';
-import { ApplicationError, BINARY_ENCODING, sleep, jsonStringify } from 'n8n-workflow';
+import {
+	ApplicationError,
+	BINARY_ENCODING,
+	sleep,
+	jsonStringify,
+	ErrorReporterProxy,
+} from 'n8n-workflow';
 import type { IExecuteResponsePromiseData } from 'n8n-workflow';
+import { strict } from 'node:assert';
 import Container, { Service } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
@@ -11,7 +18,7 @@ import { ExecutionRepository } from '@/databases/repositories/execution.reposito
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { MaxStalledCountError } from '@/errors/max-stalled-count.error';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 
 import { JOB_TYPE_NAME, QUEUE_NAME } from './constants';
@@ -40,7 +47,9 @@ export class ScalingService {
 		private readonly instanceSettings: InstanceSettings,
 		private readonly orchestrationService: OrchestrationService,
 		private readonly eventService: EventService,
-	) {}
+	) {
+		this.logger = this.logger.withScope('scaling');
+	}
 
 	// #region Lifecycle
 
@@ -70,32 +79,43 @@ export class ScalingService {
 
 		this.scheduleQueueMetrics();
 
-		this.logger.debug('[ScalingService] Queue setup completed');
+		this.logger.debug('Queue setup completed');
 	}
 
 	setupWorker(concurrency: number) {
 		this.assertWorker();
 		this.assertQueue();
 
-		void this.queue.process(
-			JOB_TYPE_NAME,
-			concurrency,
-			async (job: Job) => await this.jobProcessor.processJob(job),
-		);
+		void this.queue.process(JOB_TYPE_NAME, concurrency, async (job: Job) => {
+			try {
+				await this.jobProcessor.processJob(job);
+			} catch (error: unknown) {
+				// Errors thrown here will be sent to the main instance by bull. Logging
+				// them out and rethrowing them allows to find out which worker had the
+				// issue.
+				this.logger.error('Executing a job errored', {
+					jobId: job.id,
+					executionId: job.data.executionId,
+					error,
+				});
+				ErrorReporterProxy.error(error);
+				throw error;
+			}
+		});
 
-		this.logger.debug('[ScalingService] Worker setup completed');
+		this.logger.debug('Worker setup completed');
 	}
 
 	@OnShutdown(HIGHEST_SHUTDOWN_PRIORITY)
 	async stop() {
 		await this.queue.pause(true, true);
 
-		this.logger.debug('[ScalingService] Queue paused');
+		this.logger.debug('Queue paused');
 
 		this.stopQueueRecovery();
 		this.stopQueueMetrics();
 
-		this.logger.debug('[ScalingService] Queue recovery and metrics stopped');
+		this.logger.debug('Queue recovery and metrics stopped');
 
 		let count = 0;
 
@@ -124,12 +144,24 @@ export class ScalingService {
 		return { active, waiting };
 	}
 
-	async addJob(jobData: JobData, jobOptions: JobOptions) {
-		const { executionId } = jobData;
+	/**
+	 * Add a job to the queue.
+	 *
+	 * @param jobData Data of the job to add to the queue.
+	 * @param priority Priority of the job, from `1` (highest) to `MAX_SAFE_INTEGER` (lowest).
+	 */
+	async addJob(jobData: JobData, { priority }: { priority: number }) {
+		strict(priority > 0 && priority <= Number.MAX_SAFE_INTEGER);
+
+		const jobOptions: JobOptions = {
+			priority,
+			removeOnComplete: true,
+			removeOnFail: true,
+		};
 
 		const job = await this.queue.add(JOB_TYPE_NAME, jobData, jobOptions);
 
-		this.logger.info(`[ScalingService] Added job ${job.id} (execution ${executionId})`);
+		this.logger.info(`Added job ${job.id} (execution ${jobData.executionId})`);
 
 		return job;
 	}
@@ -150,16 +182,16 @@ export class ScalingService {
 		try {
 			if (await job.isActive()) {
 				await job.progress({ kind: 'abort-job' }); // being processed by worker
-				this.logger.debug('[ScalingService] Stopped active job', props);
+				this.logger.debug('Stopped active job', props);
 				return true;
 			}
 
 			await job.remove(); // not yet picked up, or waiting for next pickup (stalled)
-			this.logger.debug('[ScalingService] Stopped inactive job', props);
+			this.logger.debug('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 });
+			this.logger.error('Failed to stop job', { ...props, error });
 			return false;
 		}
 	}
@@ -173,42 +205,6 @@ export class ScalingService {
 	// #region Listeners
 
 	private registerListeners() {
-		let latestAttemptTs = 0;
-		let cumulativeTimeoutMs = 0;
-
-		const MAX_TIMEOUT_MS = this.globalConfig.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;
-			}
-
-			throw error;
-		});
-
 		const { instanceType } = this.instanceSettings;
 		if (instanceType === 'main' || instanceType === 'webhook') {
 			this.registerMainOrWebhookListeners();
@@ -228,6 +224,8 @@ export class ScalingService {
 		});
 
 		this.queue.on('error', (error: Error) => {
+			if ('code' in error && error.code === 'ECONNREFUSED') return; // handled by RedisClientService.retryStrategy
+
 			if (error.message.includes('job stalled more than maxStalledCount')) {
 				throw new MaxStalledCountError(error);
 			}
@@ -237,11 +235,13 @@ export class ScalingService {
 			 * Even if Redis recovers, worker will remain unable to process jobs.
 			 */
 			if (error.message.includes('Error initializing Lua scripts')) {
-				this.logger.error('[ScalingService] Fatal error initializing worker', { error });
-				this.logger.error('[ScalingService] Exiting process...');
+				this.logger.error('Fatal error initializing worker', { error });
+				this.logger.error('Exiting process...');
 				process.exit(1);
 			}
 
+			this.logger.error('Queue errored', { error });
+
 			throw error;
 		});
 	}
@@ -250,6 +250,14 @@ export class ScalingService {
 	 * Register listeners on a `main` or `webhook` process for Bull queue events.
 	 */
 	private registerMainOrWebhookListeners() {
+		this.queue.on('error', (error: Error) => {
+			if ('code' in error && error.code === 'ECONNREFUSED') return; // handled by RedisClientService.retryStrategy
+
+			this.logger.error('Queue errored', { error });
+
+			throw error;
+		});
+
 		this.queue.on('global:progress', (_jobId: JobId, msg: unknown) => {
 			if (!this.isPubSubMessage(msg)) return;
 
@@ -355,10 +363,10 @@ export class ScalingService {
 				const nextWaitMs = await this.recoverFromQueue();
 				this.scheduleQueueRecovery(nextWaitMs);
 			} catch (error) {
-				this.logger.error('[ScalingService] Failed to recover dangling executions from queue', {
+				this.logger.error('Failed to recover dangling executions from queue', {
 					msg: this.toErrorMsg(error),
 				});
-				this.logger.error('[ScalingService] Retrying...');
+				this.logger.error('Retrying...');
 
 				this.scheduleQueueRecovery();
 			}
@@ -366,7 +374,7 @@ export class ScalingService {
 
 		const wait = [this.queueRecoveryContext.waitMs / Time.minutes.toMilliseconds, 'min'].join(' ');
 
-		this.logger.debug(`[ScalingService] Scheduled queue recovery check for next ${wait}`);
+		this.logger.debug(`Scheduled queue recovery check for next ${wait}`);
 	}
 
 	private stopQueueRecovery() {
@@ -383,7 +391,7 @@ export class ScalingService {
 		const storedIds = await this.executionRepository.getInProgressExecutionIds(batchSize);
 
 		if (storedIds.length === 0) {
-			this.logger.debug('[ScalingService] Completed queue recovery check, no dangling executions');
+			this.logger.debug('Completed queue recovery check, no dangling executions');
 			return waitMs;
 		}
 
@@ -392,23 +400,22 @@ export class ScalingService {
 		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');
+			this.logger.debug('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');
+			this.logger.debug('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 },
-		);
+		this.logger.info('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
diff --git a/packages/cli/src/scaling/worker-server.ts b/packages/cli/src/scaling/worker-server.ts
index abc6a3a024..3cf6995882 100644
--- a/packages/cli/src/scaling/worker-server.ts
+++ b/packages/cli/src/scaling/worker-server.ts
@@ -2,7 +2,6 @@ import { GlobalConfig } from '@n8n/config';
 import type { Application } from 'express';
 import express from 'express';
 import { InstanceSettings } from 'n8n-core';
-import { ensureError } from 'n8n-workflow';
 import { strict as assert } from 'node:assert';
 import http from 'node:http';
 import type { Server } from 'node:http';
@@ -12,15 +11,13 @@ import { CredentialsOverwrites } from '@/credentials-overwrites';
 import * as Db from '@/db';
 import { CredentialsOverwritesAlreadySetError } from '@/errors/credentials-overwrites-already-set.error';
 import { NonJsonBodyError } from '@/errors/non-json-body.error';
-import { PortTakenError } from '@/errors/port-taken.error';
-import { ServiceUnavailableError } from '@/errors/response-errors/service-unavailable.error';
 import { ExternalHooks } from '@/external-hooks';
 import type { ICredentialsOverwrite } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { PrometheusMetricsService } from '@/metrics/prometheus-metrics.service';
 import { rawBodyReader, bodyParser } from '@/middlewares';
 import * as ResponseHelper from '@/response-helper';
-import { ScalingService } from '@/scaling/scaling.service';
+import { RedisClientService } from '@/services/redis-client.service';
 
 export type WorkerServerEndpointsConfig = {
 	/** Whether the `/healthz` endpoint is enabled. */
@@ -40,6 +37,8 @@ export type WorkerServerEndpointsConfig = {
 export class WorkerServer {
 	private readonly port: number;
 
+	private readonly address: string;
+
 	private readonly server: Server;
 
 	private readonly app: Application;
@@ -51,11 +50,11 @@ export class WorkerServer {
 	constructor(
 		private readonly globalConfig: GlobalConfig,
 		private readonly logger: Logger,
-		private readonly scalingService: ScalingService,
 		private readonly credentialsOverwrites: CredentialsOverwrites,
 		private readonly externalHooks: ExternalHooks,
 		private readonly instanceSettings: InstanceSettings,
 		private readonly prometheusMetricsService: PrometheusMetricsService,
+		private readonly redisClientService: RedisClientService,
 	) {
 		assert(this.instanceSettings.instanceType === 'worker');
 
@@ -66,9 +65,15 @@ export class WorkerServer {
 		this.server = http.createServer(this.app);
 
 		this.port = this.globalConfig.queue.health.port;
+		this.address = this.globalConfig.queue.health.address;
 
 		this.server.on('error', (error: NodeJS.ErrnoException) => {
-			if (error.code === 'EADDRINUSE') throw new PortTakenError(this.port);
+			if (error.code === 'EADDRINUSE') {
+				this.logger.error(
+					`Port ${this.port} is already in use, possibly by the n8n main process server. Please set a different port for the worker server.`,
+				);
+				process.exit(1);
+			}
 		});
 	}
 
@@ -79,7 +84,7 @@ export class WorkerServer {
 
 		await this.mountEndpoints();
 
-		await new Promise<void>((resolve) => this.server.listen(this.port, resolve));
+		await new Promise<void>((resolve) => this.server.listen(this.port, this.address, resolve));
 
 		await this.externalHooks.run('worker.ready');
 
@@ -87,11 +92,14 @@ export class WorkerServer {
 	}
 
 	private async mountEndpoints() {
-		if (this.endpointsConfig.health) {
-			this.app.get('/healthz', async (req, res) => await this.healthcheck(req, res));
+		const { health, overwrites, metrics } = this.endpointsConfig;
+
+		if (health) {
+			this.app.get('/healthz', async (_, res) => res.send({ status: 'ok' }));
+			this.app.get('/healthz/readiness', async (_, res) => await this.readiness(_, res));
 		}
 
-		if (this.endpointsConfig.overwrites) {
+		if (overwrites) {
 			const { endpoint } = this.globalConfig.credentials.overwrite;
 
 			this.app.post(`/${endpoint}`, rawBodyReader, bodyParser, (req, res) =>
@@ -99,39 +107,20 @@ export class WorkerServer {
 			);
 		}
 
-		if (this.endpointsConfig.metrics) {
+		if (metrics) {
 			await this.prometheusMetricsService.init(this.app);
 		}
 	}
 
-	private async healthcheck(_req: express.Request, res: express.Response) {
-		this.logger.debug('[WorkerServer] Health check started');
+	private async readiness(_req: express.Request, res: express.Response) {
+		const isReady =
+			Db.connectionState.connected &&
+			Db.connectionState.migrated &&
+			this.redisClientService.isConnected();
 
-		try {
-			await Db.getConnection().query('SELECT 1');
-		} catch (value) {
-			this.logger.error('[WorkerServer] No database connection', ensureError(value));
-
-			return ResponseHelper.sendErrorResponse(
-				res,
-				new ServiceUnavailableError('No database connection'),
-			);
-		}
-
-		try {
-			await this.scalingService.pingQueue();
-		} catch (value) {
-			this.logger.error('[WorkerServer] No Redis connection', ensureError(value));
-
-			return ResponseHelper.sendErrorResponse(
-				res,
-				new ServiceUnavailableError('No Redis connection'),
-			);
-		}
-
-		this.logger.debug('[WorkerServer] Health check succeeded');
-
-		ResponseHelper.sendSuccessResponse(res, { status: 'ok' }, true, 200);
+		return isReady
+			? res.status(200).send({ status: 'ok' })
+			: res.status(503).send({ status: 'error' });
 	}
 
 	private handleOverwrites(
diff --git a/packages/cli/src/scaling/worker-status.service.ts b/packages/cli/src/scaling/worker-status.service.ts
new file mode 100644
index 0000000000..725cbb0ca7
--- /dev/null
+++ b/packages/cli/src/scaling/worker-status.service.ts
@@ -0,0 +1,44 @@
+import type { WorkerStatus } from '@n8n/api-types';
+import os from 'node:os';
+import { Service } from 'typedi';
+
+import config from '@/config';
+import { N8N_VERSION } from '@/constants';
+
+import { JobProcessor } from './job-processor';
+
+@Service()
+export class WorkerStatusService {
+	constructor(private readonly jobProcessor: JobProcessor) {}
+
+	generateStatus(): WorkerStatus {
+		return {
+			senderId: config.getEnv('redis.queueModeId'),
+			runningJobsSummary: this.jobProcessor.getRunningJobsSummary(),
+			freeMem: os.freemem(),
+			totalMem: os.totalmem(),
+			uptime: process.uptime(),
+			loadAvg: os.loadavg(),
+			cpus: this.getOsCpuString(),
+			arch: os.arch(),
+			platform: os.platform(),
+			hostname: os.hostname(),
+			interfaces: Object.values(os.networkInterfaces()).flatMap((interfaces) =>
+				(interfaces ?? [])?.map((net) => ({
+					family: net.family,
+					address: net.address,
+					internal: net.internal,
+				})),
+			),
+			version: N8N_VERSION,
+		};
+	}
+
+	private getOsCpuString() {
+		const cpus = os.cpus();
+
+		if (cpus.length === 0) return 'no CPU info';
+
+		return `${cpus.length}x ${cpus[0].model} - speed: ${cpus[0].speed}`;
+	}
+}
diff --git a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts
index 4792bf8b6a..b0d6ccfad3 100644
--- a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts
+++ b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts
@@ -6,7 +6,7 @@ import { Service } from 'typedi';
 import config from '@/config';
 import { getN8nPackageJson, inDevelopment } from '@/constants';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { isApiEnabled } from '@/public-api';
 import {
 	ENV_VARS_DOCS_URL,
diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
index 27ac3b09a1..00971d71a5 100644
--- a/packages/cli/src/server.ts
+++ b/packages/cli/src/server.ts
@@ -21,7 +21,7 @@ import { CredentialsOverwrites } from '@/credentials-overwrites';
 import { ControllerRegistry } from '@/decorators';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { EventService } from '@/events/event.service';
-import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
+import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay';
 import type { ICredentialsOverwrite } from '@/interfaces';
 import { isLdapEnabled } from '@/ldap/helpers.ee';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
@@ -35,11 +35,11 @@ import type { FrontendService } from '@/services/frontend.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 
 import '@/controllers/active-workflows.controller';
-import '@/controllers/annotation-tags.controller';
+import '@/controllers/annotation-tags.controller.ee';
 import '@/controllers/auth.controller';
 import '@/controllers/binary-data.controller';
 import '@/controllers/curl.controller';
-import '@/controllers/ai-assistant.controller';
+import '@/controllers/ai.controller';
 import '@/controllers/dynamic-node-parameters.controller';
 import '@/controllers/invitation.controller';
 import '@/controllers/me.controller';
@@ -56,6 +56,7 @@ import '@/controllers/translation.controller';
 import '@/controllers/users.controller';
 import '@/controllers/user-settings.controller';
 import '@/controllers/workflow-statistics.controller';
+import '@/controllers/api-keys.controller';
 import '@/credentials/credentials.controller';
 import '@/eventbus/event-bus.controller';
 import '@/events/events.controller';
@@ -251,6 +252,7 @@ export class Server extends AbstractServer {
 					JSON.stringify({
 						dsn: this.globalConfig.sentry.frontendDsn,
 						environment: process.env.ENVIRONMENT || 'development',
+						serverName: process.env.DEPLOYMENT_NAME,
 						release: N8N_VERSION,
 					}),
 				);
diff --git a/packages/cli/src/services/__tests__/orchestration.service.test.ts b/packages/cli/src/services/__tests__/orchestration.service.test.ts
index f77dcd90cc..6c66573047 100644
--- a/packages/cli/src/services/__tests__/orchestration.service.test.ts
+++ b/packages/cli/src/services/__tests__/orchestration.service.test.ts
@@ -6,20 +6,12 @@ import Container from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import config from '@/config';
-import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
 import { Push } from '@/push';
-import type { RedisServiceWorkerResponseObject } from '@/scaling/redis/redis-service-commands';
-import * as helpers from '@/services/orchestration/helpers';
-import { handleCommandMessageMain } from '@/services/orchestration/main/handle-command-message-main';
-import { handleWorkerResponseMessageMain } from '@/services/orchestration/main/handle-worker-response-message-main';
-import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { RedisClientService } from '@/services/redis-client.service';
 import { mockInstance } from '@test/mocking';
 
-import type { MainResponseReceivedHandlerOptions } from '../orchestration/main/types';
-
 config.set('executions.mode', 'queue');
 config.set('generic.instanceType', 'main');
 
@@ -29,24 +21,13 @@ const mockRedisClient = mock<Redis>();
 redisClientService.createClient.mockReturnValue(mockRedisClient);
 
 const os = Container.get(OrchestrationService);
-const handler = Container.get(OrchestrationHandlerMainService);
 mockInstance(ActiveWorkflowManager);
 
 let queueModeId: string;
 
-const workerRestartEventBusResponse: RedisServiceWorkerResponseObject = {
-	senderId: 'test',
-	workerId: 'test',
-	command: 'restartEventBus',
-	payload: {
-		result: 'success',
-	},
-};
-
 describe('Orchestration Service', () => {
 	mockInstance(Push);
 	mockInstance(ExternalSecretsManager);
-	const eventBus = mockInstance(MessageEventBus);
 
 	beforeAll(async () => {
 		queueModeId = config.get('redis.queueModeId');
@@ -65,73 +46,11 @@ describe('Orchestration Service', () => {
 
 	test('should initialize', async () => {
 		await os.init();
-		await handler.init();
 		// @ts-expect-error Private field
 		expect(os.publisher).toBeDefined();
-		// @ts-expect-error Private field
-		expect(handler.subscriber).toBeDefined();
 		expect(queueModeId).toBeDefined();
 	});
 
-	test('should handle worker responses', async () => {
-		const response = await handleWorkerResponseMessageMain(
-			JSON.stringify(workerRestartEventBusResponse),
-			mock<MainResponseReceivedHandlerOptions>(),
-		);
-		expect(response?.command).toEqual('restartEventBus');
-	});
-
-	test('should handle command messages from others', async () => {
-		const responseFalseId = await handleCommandMessageMain(
-			JSON.stringify({
-				senderId: 'test',
-				command: 'reloadLicense',
-			}),
-		);
-		expect(responseFalseId).toBeDefined();
-		expect(responseFalseId!.command).toEqual('reloadLicense');
-		expect(responseFalseId!.senderId).toEqual('test');
-	});
-
-	test('should reject command messages from itself', async () => {
-		const response = await handleCommandMessageMain(
-			JSON.stringify({ ...workerRestartEventBusResponse, senderId: queueModeId }),
-		);
-		expect(response).toBeDefined();
-		expect(response!.command).toEqual('restartEventBus');
-		expect(response!.senderId).toEqual(queueModeId);
-		expect(eventBus.restart).not.toHaveBeenCalled();
-	});
-
-	test('should send command messages', async () => {
-		// @ts-expect-error Private field
-		jest.spyOn(os.publisher, 'publishCommand').mockImplementation(async () => {});
-		await os.getWorkerIds();
-		// @ts-expect-error Private field
-		expect(os.publisher.publishCommand).toHaveBeenCalled();
-		// @ts-expect-error Private field
-		jest.spyOn(os.publisher, 'publishCommand').mockRestore();
-	});
-
-	test('should prevent receiving commands too often', async () => {
-		jest.spyOn(helpers, 'debounceMessageReceiver');
-		const res1 = await handleCommandMessageMain(
-			JSON.stringify({
-				senderId: 'test',
-				command: 'reloadExternalSecretsProviders',
-			}),
-		);
-		const res2 = await handleCommandMessageMain(
-			JSON.stringify({
-				senderId: 'test',
-				command: 'reloadExternalSecretsProviders',
-			}),
-		);
-		expect(helpers.debounceMessageReceiver).toHaveBeenCalledTimes(2);
-		expect(res1!.payload).toBeUndefined();
-		expect(res2!.payload).toEqual({ result: 'debounced' });
-	});
-
 	describe('shouldAddWebhooks', () => {
 		test('should return true for init', () => {
 			// We want to ensure that webhooks are populated on init
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 a8d73cbfff..fdecb7ae5a 100644
--- a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
+++ b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
@@ -7,7 +7,7 @@ import {
 } from '@n8n/typeorm';
 import { mocked } from 'jest-mock';
 import { mock } from 'jest-mock-extended';
-import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
+import type { INode, IRun, WorkflowExecuteMode } from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import config from '@/config';
@@ -167,6 +167,22 @@ describe('WorkflowStatisticsService', () => {
 			});
 		});
 
+		test('should emit event with no `userId` if workflow is owned by team project', async () => {
+			const workflowId = '123';
+			ownershipService.getPersonalProjectOwnerCached.mockResolvedValueOnce(null);
+			const node = mock<INode>({ id: '123', type: 'n8n-nodes-base.noOp', credentials: {} });
+
+			await workflowStatisticsService.nodeFetchedData(workflowId, node);
+
+			expect(eventService.emit).toHaveBeenCalledWith('first-workflow-data-loaded', {
+				userId: '',
+				project: fakeProject.id,
+				workflowId,
+				nodeType: node.type,
+				nodeId: node.id,
+			});
+		});
+
 		test('should create metrics with credentials when the db is updated', async () => {
 			// Call the function with a production success result, ensure metrics hook gets called
 			const workflowId = '1';
diff --git a/packages/cli/src/services/active-workflows.service.ts b/packages/cli/src/services/active-workflows.service.ts
index f2aaf9293d..61aa875d1a 100644
--- a/packages/cli/src/services/active-workflows.service.ts
+++ b/packages/cli/src/services/active-workflows.service.ts
@@ -5,7 +5,7 @@ import type { User } from '@/databases/entities/user';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 @Service()
 export class ActiveWorkflowsService {
diff --git a/packages/cli/src/services/ai-assistant.service.ts b/packages/cli/src/services/ai.service.ts
similarity index 74%
rename from packages/cli/src/services/ai-assistant.service.ts
rename to packages/cli/src/services/ai.service.ts
index 77234165c1..a7b07219b5 100644
--- a/packages/cli/src/services/ai-assistant.service.ts
+++ b/packages/cli/src/services/ai.service.ts
@@ -1,8 +1,8 @@
+import { GlobalConfig } from '@n8n/config';
 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 { Service } from 'typedi';
-import type { Response } from 'undici';
 
 import config from '@/config';
 import type { AiAssistantRequest } from '@/requests';
@@ -11,10 +11,13 @@ import { N8N_VERSION } from '../constants';
 import { License } from '../license';
 
 @Service()
-export class AiAssistantService {
+export class AiService {
 	private client: AiAssistantClient | undefined;
 
-	constructor(private readonly licenseService: License) {}
+	constructor(
+		private readonly licenseService: License,
+		private readonly globalConfig: GlobalConfig,
+	) {}
 
 	async init() {
 		const aiAssistantEnabled = this.licenseService.isAiAssistantEnabled();
@@ -25,7 +28,7 @@ export class AiAssistantService {
 		const licenseCert = await this.licenseService.loadCertStr();
 		const consumerId = this.licenseService.getConsumerId();
 		const baseUrl = config.get('aiAssistant.baseUrl');
-		const logLevel = config.getEnv('logs.level');
+		const logLevel = this.globalConfig.logging.level;
 
 		this.client = new AiAssistantClient({
 			licenseCert,
@@ -36,7 +39,7 @@ export class AiAssistantService {
 		});
 	}
 
-	async chat(payload: AiAssistantSDK.ChatRequestPayload, user: IUser): Promise<Response> {
+	async chat(payload: AiAssistantSDK.ChatRequestPayload, user: IUser) {
 		if (!this.client) {
 			await this.init();
 		}
@@ -53,4 +56,13 @@ export class AiAssistantService {
 
 		return await this.client.applySuggestion(payload, { id: user.id });
 	}
+
+	async askAi(payload: AiAssistantSDK.AskAiRequestPayload, user: IUser) {
+		if (!this.client) {
+			await this.init();
+		}
+		assert(this.client, 'Assistant client not setup');
+
+		return await this.client.askAi(payload, { id: user.id });
+	}
 }
diff --git a/packages/cli/src/services/annotation-tag.service.ts b/packages/cli/src/services/annotation-tag.service.ee.ts
similarity index 96%
rename from packages/cli/src/services/annotation-tag.service.ts
rename to packages/cli/src/services/annotation-tag.service.ee.ts
index 27c93041b5..671395168c 100644
--- a/packages/cli/src/services/annotation-tag.service.ts
+++ b/packages/cli/src/services/annotation-tag.service.ee.ts
@@ -1,7 +1,7 @@
 import { Service } from 'typedi';
 
-import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
-import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository';
+import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
+import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository.ee';
 import { validateEntity } from '@/generic-helpers';
 import type { IAnnotationTagDb, IAnnotationTagWithCountDb } from '@/interfaces';
 
diff --git a/packages/cli/src/services/cache/cache.service.ts b/packages/cli/src/services/cache/cache.service.ts
index 3eda66ecb8..aefe9310fc 100644
--- a/packages/cli/src/services/cache/cache.service.ts
+++ b/packages/cli/src/services/cache/cache.service.ts
@@ -89,6 +89,9 @@ export class CacheService extends TypedEmitter<CacheEvents> {
 	//             storing
 	// ----------------------------------
 
+	/**
+	 * @param ttl Time to live in milliseconds
+	 */
 	async set(key: string, value: unknown, ttl?: number) {
 		if (!this.cache) await this.init();
 
diff --git a/packages/cli/src/services/community-packages.service.ts b/packages/cli/src/services/community-packages.service.ts
index 500518ae02..b157119cf2 100644
--- a/packages/cli/src/services/community-packages.service.ts
+++ b/packages/cli/src/services/community-packages.service.ts
@@ -22,7 +22,7 @@ import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import type { CommunityPackages } from '@/interfaces';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { toError } from '@/utils';
 
 import { OrchestrationService } from './orchestration.service';
diff --git a/packages/cli/src/services/credentials-tester.service.ts b/packages/cli/src/services/credentials-tester.service.ts
index b66d4a474f..30504e464b 100644
--- a/packages/cli/src/services/credentials-tester.service.ts
+++ b/packages/cli/src/services/credentials-tester.service.ts
@@ -35,7 +35,7 @@ import { Service } from 'typedi';
 
 import { CredentialTypes } from '@/credential-types';
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 6ac3a1863c..a83158e96e 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -17,7 +17,7 @@ import { getVariablesLimit } from '@/environments/variables/environment-helpers'
 import { getLdapLoginLabel } from '@/ldap/helpers.ee';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { isApiEnabled } from '@/public-api';
 import type { CommunityPackagesService } from '@/services/community-packages.service';
 import { getSamlLoginLabel } from '@/sso/saml/saml-helpers';
@@ -88,6 +88,7 @@ export class FrontendService {
 			endpointFormWaiting: this.globalConfig.endpoints.formWaiting,
 			endpointWebhook: this.globalConfig.endpoints.webhook,
 			endpointWebhookTest: this.globalConfig.endpoints.webhookTest,
+			endpointWebhookWaiting: this.globalConfig.endpoints.webhookWaiting,
 			saveDataErrorExecution: config.getEnv('executions.saveDataOnError'),
 			saveDataSuccessExecution: config.getEnv('executions.saveDataOnSuccess'),
 			saveManualExecutions: config.getEnv('executions.saveDataManualExecutions'),
@@ -123,7 +124,7 @@ export class FrontendService {
 				apiKey: config.getEnv('diagnostics.config.posthog.apiKey'),
 				autocapture: false,
 				disableSessionRecording: config.getEnv('deployment.type') !== 'cloud',
-				debug: config.getEnv('logs.level') === 'debug',
+				debug: this.globalConfig.logging.level === 'debug',
 			},
 			personalizationSurveyEnabled:
 				config.getEnv('personalization.enabled') && config.getEnv('diagnostics.enabled'),
@@ -153,7 +154,7 @@ export class FrontendService {
 				},
 			},
 			workflowTagsDisabled: config.getEnv('workflowTagsDisabled'),
-			logLevel: config.getEnv('logs.level'),
+			logLevel: this.globalConfig.logging.level,
 			hiringBannerEnabled: config.getEnv('hiringBanner.enabled'),
 			aiAssistant: {
 				enabled: false,
@@ -211,8 +212,8 @@ export class FrontendService {
 			banners: {
 				dismissed: [],
 			},
-			ai: {
-				enabled: config.getEnv('ai.enabled'),
+			askAi: {
+				enabled: false,
 			},
 			workflowHistory: {
 				pruneTime: -1,
@@ -273,6 +274,7 @@ export class FrontendService {
 		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
 		const isS3Licensed = this.license.isBinaryDataS3Licensed();
 		const isAiAssistantEnabled = this.license.isAiAssistantEnabled();
+		const isAskAiEnabled = this.license.isAskAiEnabled();
 
 		this.settings.license.planName = this.license.getPlanName();
 		this.settings.license.consumerId = this.license.getConsumerId();
@@ -329,6 +331,10 @@ export class FrontendService {
 			this.settings.aiAssistant.enabled = isAiAssistantEnabled;
 		}
 
+		if (isAskAiEnabled) {
+			this.settings.askAi.enabled = isAskAiEnabled;
+		}
+
 		this.settings.mfa.enabled = config.get('mfa.enabled');
 
 		this.settings.executionMode = config.getEnv('executions.mode');
diff --git a/packages/cli/src/services/orchestration.service.ts b/packages/cli/src/services/orchestration.service.ts
index 80f428bb81..b8aba46285 100644
--- a/packages/cli/src/services/orchestration.service.ts
+++ b/packages/cli/src/services/orchestration.service.ts
@@ -3,15 +3,12 @@ import type { WorkflowActivateMode } from 'n8n-workflow';
 import Container, { Service } from 'typedi';
 
 import config from '@/config';
-import { Logger } from '@/logger';
+import type { PubSubCommandMap } from '@/events/maps/pub-sub.event-map';
+import { Logger } from '@/logging/logger.service';
 import type { Publisher } from '@/scaling/pubsub/publisher.service';
 import type { Subscriber } from '@/scaling/pubsub/subscriber.service';
 
 import { MultiMainSetup } from './orchestration/main/multi-main-setup.ee';
-import type {
-	RedisServiceBaseCommand,
-	RedisServiceCommand,
-} from '../scaling/redis/redis-service-commands';
 
 @Service()
 export class OrchestrationService {
@@ -100,14 +97,18 @@ export class OrchestrationService {
 	//            pubsub
 	// ----------------------------------
 
-	async publish(command: RedisServiceCommand, data?: unknown) {
+	async publish<CommandKey extends keyof PubSubCommandMap>(
+		commandKey: CommandKey,
+		payload?: PubSubCommandMap[CommandKey],
+	) {
 		if (!this.sanityCheck()) return;
 
-		const payload = data as RedisServiceBaseCommand['payload'];
+		this.logger.debug(
+			`[Instance ID ${this.instanceId}] Publishing command "${commandKey}"`,
+			payload,
+		);
 
-		this.logger.debug(`[Instance ID ${this.instanceId}] Publishing command "${command}"`, payload);
-
-		await this.publisher.publishCommand({ command, payload });
+		await this.publisher.publishCommand({ command: commandKey, payload });
 	}
 
 	// ----------------------------------
@@ -117,7 +118,7 @@ export class OrchestrationService {
 	async getWorkerStatus(id?: string) {
 		if (!this.sanityCheck()) return;
 
-		const command = 'getStatus';
+		const command = 'get-worker-status';
 
 		this.logger.debug(`Sending "${command}" to command channel`);
 
@@ -127,16 +128,6 @@ export class OrchestrationService {
 		});
 	}
 
-	async getWorkerIds() {
-		if (!this.sanityCheck()) return;
-
-		const command = 'getId';
-
-		this.logger.debug(`Sending "${command}" to command channel`);
-
-		await this.publisher.publishCommand({ command });
-	}
-
 	// ----------------------------------
 	//           activations
 	// ----------------------------------
diff --git a/packages/cli/src/services/orchestration/helpers.ts b/packages/cli/src/services/orchestration/helpers.ts
deleted file mode 100644
index fd5e444cff..0000000000
--- a/packages/cli/src/services/orchestration/helpers.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { jsonParse } from 'n8n-workflow';
-import os from 'node:os';
-import { Container } from 'typedi';
-
-import { Logger } from '@/logger';
-import { COMMAND_PUBSUB_CHANNEL } from '@/scaling/constants';
-
-import type { RedisServiceCommandObject } from '../../scaling/redis/redis-service-commands';
-
-export interface RedisServiceCommandLastReceived {
-	[date: string]: Date;
-}
-
-export function messageToRedisServiceCommandObject(messageString: string) {
-	if (!messageString) return;
-	let message: RedisServiceCommandObject;
-	try {
-		message = jsonParse<RedisServiceCommandObject>(messageString);
-	} catch {
-		Container.get(Logger).debug(
-			`Received invalid message via channel ${COMMAND_PUBSUB_CHANNEL}: "${messageString}"`,
-		);
-		return;
-	}
-	return message;
-}
-
-const lastReceived: RedisServiceCommandLastReceived = {};
-
-export function debounceMessageReceiver(message: RedisServiceCommandObject, timeout: number = 100) {
-	const now = new Date();
-	const lastReceivedDate = lastReceived[message.command];
-	if (lastReceivedDate && now.getTime() - lastReceivedDate.getTime() < timeout) {
-		return false;
-	}
-	lastReceived[message.command] = now;
-	return true;
-}
-
-export function getOsCpuString(): string {
-	const cpus = os.cpus();
-	if (cpus.length === 0) return 'no CPU info';
-	return `${cpus.length}x ${cpus[0].model} - speed: ${cpus[0].speed}`;
-}
diff --git a/packages/cli/src/services/orchestration/main/handle-command-message-main.ts b/packages/cli/src/services/orchestration/main/handle-command-message-main.ts
deleted file mode 100644
index 15917e11b7..0000000000
--- a/packages/cli/src/services/orchestration/main/handle-command-message-main.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-import { InstanceSettings } from 'n8n-core';
-import { Container } from 'typedi';
-
-import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import config from '@/config';
-import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
-import { License } from '@/license';
-import { Logger } from '@/logger';
-import { Push } from '@/push';
-import { CommunityPackagesService } from '@/services/community-packages.service';
-import { OrchestrationService } from '@/services/orchestration.service';
-import { TestWebhooks } from '@/webhooks/test-webhooks';
-
-import { debounceMessageReceiver, messageToRedisServiceCommandObject } from '../helpers';
-
-// eslint-disable-next-line complexity
-export async function handleCommandMessageMain(messageString: string) {
-	const queueModeId = config.getEnv('redis.queueModeId');
-	const isMainInstance = Container.get(InstanceSettings).instanceType === 'main';
-	const message = messageToRedisServiceCommandObject(messageString);
-	const logger = Container.get(Logger);
-
-	if (message) {
-		logger.debug(
-			`RedisCommandHandler(main): Received command message ${message.command} from ${message.senderId}`,
-		);
-
-		const selfSendingAllowed = [
-			'add-webhooks-triggers-and-pollers',
-			'remove-triggers-and-pollers',
-		].includes(message.command);
-
-		if (
-			!selfSendingAllowed &&
-			(message.senderId === queueModeId ||
-				(message.targets && !message.targets.includes(queueModeId)))
-		) {
-			// Skipping command message because it's not for this instance
-			logger.debug(
-				`Skipping command message ${message.command} because it's not for this instance.`,
-			);
-			return message;
-		}
-
-		const push = Container.get(Push);
-
-		switch (message.command) {
-			case 'reloadLicense':
-				if (!debounceMessageReceiver(message, 500)) {
-					message.payload = {
-						result: 'debounced',
-					};
-					return message;
-				}
-
-				if (isMainInstance && !config.getEnv('multiMainSetup.enabled')) {
-					return message; // this main is the sender, so disregard
-				}
-				await Container.get(License).reload();
-				break;
-			case 'restartEventBus':
-				if (!debounceMessageReceiver(message, 200)) {
-					message.payload = {
-						result: 'debounced',
-					};
-					return message;
-				}
-				await Container.get(MessageEventBus).restart();
-			case 'reloadExternalSecretsProviders':
-				if (!debounceMessageReceiver(message, 200)) {
-					message.payload = {
-						result: 'debounced',
-					};
-					return message;
-				}
-				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)) {
-					message.payload = { result: 'debounced' };
-					return message;
-				}
-
-				const orchestrationService = Container.get(OrchestrationService);
-
-				if (orchestrationService.isFollower) break;
-
-				if (typeof message.payload?.workflowId !== 'string') break;
-
-				const { workflowId } = message.payload;
-
-				try {
-					await Container.get(ActiveWorkflowManager).add(workflowId, 'activate', undefined, {
-						shouldPublish: false, // prevent leader re-publishing message
-					});
-
-					push.broadcast('workflowActivated', { workflowId });
-
-					// instruct followers to show activation in UI
-					await orchestrationService.publish('display-workflow-activation', { workflowId });
-				} catch (error) {
-					if (error instanceof Error) {
-						await Container.get(WorkflowRepository).update(workflowId, { active: false });
-
-						Container.get(Push).broadcast('workflowFailedToActivate', {
-							workflowId,
-							errorMessage: error.message,
-						});
-
-						await Container.get(OrchestrationService).publish('workflow-failed-to-activate', {
-							workflowId,
-							errorMessage: error.message,
-						});
-					}
-				}
-
-				break;
-			}
-
-			case 'remove-triggers-and-pollers': {
-				if (!debounceMessageReceiver(message, 100)) {
-					message.payload = { result: 'debounced' };
-					return message;
-				}
-
-				const orchestrationService = Container.get(OrchestrationService);
-
-				if (orchestrationService.isFollower) break;
-
-				if (typeof message.payload?.workflowId !== 'string') break;
-
-				const { workflowId } = message.payload;
-
-				const activeWorkflowManager = Container.get(ActiveWorkflowManager);
-
-				await activeWorkflowManager.removeActivationError(workflowId);
-				await activeWorkflowManager.removeWorkflowTriggersAndPollers(workflowId);
-
-				push.broadcast('workflowDeactivated', { workflowId });
-
-				// instruct followers to show workflow deactivation in UI
-				await orchestrationService.publish('display-workflow-deactivation', { workflowId });
-
-				break;
-			}
-
-			case 'display-workflow-activation': {
-				if (!debounceMessageReceiver(message, 100)) {
-					message.payload = { result: 'debounced' };
-					return message;
-				}
-
-				const { workflowId } = message.payload ?? {};
-
-				if (typeof workflowId !== 'string') break;
-
-				push.broadcast('workflowActivated', { workflowId });
-
-				break;
-			}
-
-			case 'display-workflow-deactivation': {
-				if (!debounceMessageReceiver(message, 100)) {
-					message.payload = { result: 'debounced' };
-					return message;
-				}
-
-				const { workflowId } = message.payload ?? {};
-
-				if (typeof workflowId !== 'string') break;
-
-				push.broadcast('workflowDeactivated', { workflowId });
-
-				break;
-			}
-
-			case 'workflow-failed-to-activate': {
-				if (!debounceMessageReceiver(message, 100)) {
-					message.payload = { result: 'debounced' };
-					return message;
-				}
-
-				const { workflowId, errorMessage } = message.payload ?? {};
-
-				if (typeof workflowId !== 'string' || typeof errorMessage !== 'string') break;
-
-				Container.get(Push).broadcast('workflowFailedToActivate', { workflowId, errorMessage });
-
-				break;
-			}
-
-			case 'relay-execution-lifecycle-event': {
-				/**
-				 * Do not debounce this - all events share the same message name.
-				 */
-
-				const { type, args, pushRef } = message.payload;
-
-				if (!push.getBackend().hasPushRef(pushRef)) break;
-
-				push.send(type, args, pushRef);
-
-				break;
-			}
-
-			case 'clear-test-webhooks': {
-				if (!debounceMessageReceiver(message, 100)) {
-					// @ts-expect-error Legacy typing
-					message.payload = { result: 'debounced' };
-					return message;
-				}
-
-				const { webhookKey, workflowEntity, pushRef } = message.payload;
-
-				if (!push.getBackend().hasPushRef(pushRef)) break;
-
-				const testWebhooks = Container.get(TestWebhooks);
-
-				testWebhooks.clearTimeout(webhookKey);
-
-				const workflow = testWebhooks.toWorkflow(workflowEntity);
-
-				await testWebhooks.deactivateWebhooks(workflow);
-
-				break;
-			}
-
-			default:
-				break;
-		}
-		return message;
-	}
-	return;
-}
diff --git a/packages/cli/src/services/orchestration/main/handle-worker-response-message-main.ts b/packages/cli/src/services/orchestration/main/handle-worker-response-message-main.ts
deleted file mode 100644
index da3cf5a507..0000000000
--- a/packages/cli/src/services/orchestration/main/handle-worker-response-message-main.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { WorkerStatus } from '@n8n/api-types';
-import { jsonParse } from 'n8n-workflow';
-import Container from 'typedi';
-
-import { Logger } from '@/logger';
-import { WORKER_RESPONSE_PUBSUB_CHANNEL } from '@/scaling/constants';
-
-import type { MainResponseReceivedHandlerOptions } from './types';
-import { Push } from '../../../push';
-import type { RedisServiceWorkerResponseObject } from '../../../scaling/redis/redis-service-commands';
-
-export async function handleWorkerResponseMessageMain(
-	messageString: string,
-	options: MainResponseReceivedHandlerOptions,
-) {
-	const workerResponse = jsonParse<RedisServiceWorkerResponseObject | null>(messageString, {
-		fallbackValue: null,
-	});
-
-	if (!workerResponse) {
-		Container.get(Logger).debug(
-			`Received invalid message via channel ${WORKER_RESPONSE_PUBSUB_CHANNEL}: "${messageString}"`,
-		);
-		return;
-	}
-
-	if (workerResponse.targets && !workerResponse.targets.includes(options.queueModeId)) return;
-
-	switch (workerResponse.command) {
-		case 'getStatus':
-			Container.get(Push).broadcast('sendWorkerStatusMessage', {
-				workerId: workerResponse.workerId,
-				status: workerResponse.payload as WorkerStatus,
-			});
-			break;
-		case 'getId':
-			break;
-		default:
-			Container.get(Logger).debug(
-				`Received worker response ${workerResponse.command} from ${workerResponse.workerId}`,
-			);
-	}
-
-	return workerResponse;
-}
diff --git a/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts b/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts
index 98dbce7fde..bb1b52519c 100644
--- a/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts
+++ b/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts
@@ -4,7 +4,7 @@ import { Service } from 'typedi';
 
 import config from '@/config';
 import { TIME } from '@/constants';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
 import { RedisClientService } from '@/services/redis-client.service';
 import { TypedEmitter } from '@/typed-emitter';
diff --git a/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts b/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts
deleted file mode 100644
index 7f4effdd4a..0000000000
--- a/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Service } from 'typedi';
-
-import { Subscriber } from '@/scaling/pubsub/subscriber.service';
-
-import { handleCommandMessageMain } from './handle-command-message-main';
-import { handleWorkerResponseMessageMain } from './handle-worker-response-message-main';
-import type { MainResponseReceivedHandlerOptions } from './types';
-import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
-
-@Service()
-export class OrchestrationHandlerMainService extends OrchestrationHandlerService {
-	constructor(private readonly subscriber: Subscriber) {
-		super();
-	}
-
-	async initSubscriber(options: MainResponseReceivedHandlerOptions) {
-		await this.subscriber.subscribe('n8n.commands');
-		await this.subscriber.subscribe('n8n.worker-response');
-
-		this.subscriber.setMessageHandler('n8n.worker-response', async (message: string) => {
-			await handleWorkerResponseMessageMain(message, options);
-		});
-
-		this.subscriber.setMessageHandler('n8n.commands', handleCommandMessageMain);
-	}
-}
diff --git a/packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts b/packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts
deleted file mode 100644
index 542b8f1f52..0000000000
--- a/packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { InstanceSettings } from 'n8n-core';
-import Container from 'typedi';
-import { Logger } from 'winston';
-
-import config from '@/config';
-import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
-import { License } from '@/license';
-import { CommunityPackagesService } from '@/services/community-packages.service';
-
-import { messageToRedisServiceCommandObject, debounceMessageReceiver } from '../helpers';
-
-export async function handleCommandMessageWebhook(messageString: string) {
-	const queueModeId = config.getEnv('redis.queueModeId');
-	const isMainInstance = Container.get(InstanceSettings).instanceType === 'main';
-	const message = messageToRedisServiceCommandObject(messageString);
-	const logger = Container.get(Logger);
-
-	if (message) {
-		logger.debug(
-			`RedisCommandHandler(main): Received command message ${message.command} from ${message.senderId}`,
-		);
-
-		if (
-			message.senderId === queueModeId ||
-			(message.targets && !message.targets.includes(queueModeId))
-		) {
-			// Skipping command message because it's not for this instance
-			logger.debug(
-				`Skipping command message ${message.command} because it's not for this instance.`,
-			);
-			return message;
-		}
-
-		switch (message.command) {
-			case 'reloadLicense':
-				if (!debounceMessageReceiver(message, 500)) {
-					message.payload = {
-						result: 'debounced',
-					};
-					return message;
-				}
-
-				if (isMainInstance && !config.getEnv('multiMainSetup.enabled')) {
-					// at this point in time, only a single main instance is supported, thus this command _should_ never be caught currently
-					logger.error(
-						'Received command to reload license via Redis, but this should not have happened and is not supported on the main instance yet.',
-					);
-					return message;
-				}
-				await Container.get(License).reload();
-				break;
-			case 'restartEventBus':
-				if (!debounceMessageReceiver(message, 200)) {
-					message.payload = {
-						result: 'debounced',
-					};
-					return message;
-				}
-				await Container.get(MessageEventBus).restart();
-			case 'reloadExternalSecretsProviders':
-				if (!debounceMessageReceiver(message, 200)) {
-					message.payload = {
-						result: 'debounced',
-					};
-					return message;
-				}
-				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;
-		}
-
-		return message;
-	}
-
-	return;
-}
diff --git a/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts b/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts
deleted file mode 100644
index de7bded68e..0000000000
--- a/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Service } from 'typedi';
-
-import { Subscriber } from '@/scaling/pubsub/subscriber.service';
-
-import { handleCommandMessageWebhook } from './handle-command-message-webhook';
-import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
-
-@Service()
-export class OrchestrationHandlerWebhookService extends OrchestrationHandlerService {
-	constructor(private readonly subscriber: Subscriber) {
-		super();
-	}
-
-	async initSubscriber() {
-		await this.subscriber.subscribe('n8n.commands');
-
-		this.subscriber.setMessageHandler('n8n.commands', handleCommandMessageWebhook);
-	}
-}
diff --git a/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts b/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts
deleted file mode 100644
index 45b6bd57c9..0000000000
--- a/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { jsonParse } from 'n8n-workflow';
-import os from 'node:os';
-import Container from 'typedi';
-
-import { N8N_VERSION } from '@/constants';
-import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
-import { License } from '@/license';
-import { Logger } from '@/logger';
-import { COMMAND_PUBSUB_CHANNEL } from '@/scaling/constants';
-import type { RedisServiceCommandObject } from '@/scaling/redis/redis-service-commands';
-import { CommunityPackagesService } from '@/services/community-packages.service';
-
-import type { WorkerCommandReceivedHandlerOptions } from './types';
-import { debounceMessageReceiver, getOsCpuString } from '../helpers';
-
-// eslint-disable-next-line complexity
-export async function getWorkerCommandReceivedHandler(
-	messageString: string,
-	options: WorkerCommandReceivedHandlerOptions,
-) {
-	if (!messageString) return;
-
-	const logger = Container.get(Logger);
-	let message: RedisServiceCommandObject;
-	try {
-		message = jsonParse<RedisServiceCommandObject>(messageString);
-	} catch {
-		logger.debug(
-			`Received invalid message via channel ${COMMAND_PUBSUB_CHANNEL}: "${messageString}"`,
-		);
-		return;
-	}
-	if (message) {
-		logger.debug(
-			`RedisCommandHandler(worker): Received command message ${message.command} from ${message.senderId}`,
-		);
-		if (message.targets && !message.targets.includes(options.queueModeId)) {
-			return; // early return if the message is not for this worker
-		}
-		switch (message.command) {
-			case 'getStatus':
-				if (!debounceMessageReceiver(message, 500)) return;
-				await options.publisher.publishWorkerResponse({
-					workerId: options.queueModeId,
-					command: 'getStatus',
-					payload: {
-						workerId: options.queueModeId,
-						runningJobsSummary: options.getRunningJobsSummary(),
-						freeMem: os.freemem(),
-						totalMem: os.totalmem(),
-						uptime: process.uptime(),
-						loadAvg: os.loadavg(),
-						cpus: getOsCpuString(),
-						arch: os.arch(),
-						platform: os.platform(),
-						hostname: os.hostname(),
-						interfaces: Object.values(os.networkInterfaces()).flatMap((interfaces) =>
-							(interfaces ?? [])?.map((net) => ({
-								family: net.family,
-								address: net.address,
-								internal: net.internal,
-							})),
-						),
-						version: N8N_VERSION,
-					},
-				});
-				break;
-			case 'getId':
-				if (!debounceMessageReceiver(message, 500)) return;
-				await options.publisher.publishWorkerResponse({
-					workerId: options.queueModeId,
-					command: 'getId',
-				});
-				break;
-			case 'restartEventBus':
-				if (!debounceMessageReceiver(message, 500)) return;
-				try {
-					await Container.get(MessageEventBus).restart();
-					await options.publisher.publishWorkerResponse({
-						workerId: options.queueModeId,
-						command: 'restartEventBus',
-						payload: {
-							result: 'success',
-						},
-					});
-				} catch (error) {
-					await options.publisher.publishWorkerResponse({
-						workerId: options.queueModeId,
-						command: 'restartEventBus',
-						payload: {
-							result: 'error',
-							error: (error as Error).message,
-						},
-					});
-				}
-				break;
-			case 'reloadExternalSecretsProviders':
-				if (!debounceMessageReceiver(message, 500)) return;
-				try {
-					await Container.get(ExternalSecretsManager).reloadAllProviders();
-					await options.publisher.publishWorkerResponse({
-						workerId: options.queueModeId,
-						command: 'reloadExternalSecretsProviders',
-						payload: {
-							result: 'success',
-						},
-					});
-				} catch (error) {
-					await options.publisher.publishWorkerResponse({
-						workerId: options.queueModeId,
-						command: 'reloadExternalSecretsProviders',
-						payload: {
-							result: 'error',
-							error: (error as Error).message,
-						},
-					});
-				}
-				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();
-				break;
-			case 'stopWorker':
-				if (!debounceMessageReceiver(message, 500)) return;
-				// TODO: implement proper shutdown
-				// await this.stopProcess();
-				break;
-			default:
-				if (
-					message.command === 'relay-execution-lifecycle-event' ||
-					message.command === 'clear-test-webhooks'
-				) {
-					break; // meant only for main
-				}
-
-				logger.debug(
-					`Received unknown command via channel ${COMMAND_PUBSUB_CHANNEL}: "${message.command}"`,
-				);
-				break;
-		}
-	}
-}
diff --git a/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts b/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts
deleted file mode 100644
index 06113d7344..0000000000
--- a/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Service } from 'typedi';
-
-import { Subscriber } from '@/scaling/pubsub/subscriber.service';
-
-import { getWorkerCommandReceivedHandler } from './handle-command-message-worker';
-import type { WorkerCommandReceivedHandlerOptions } from './types';
-import { OrchestrationHandlerService } from '../../orchestration.handler.base.service';
-
-@Service()
-export class OrchestrationHandlerWorkerService extends OrchestrationHandlerService {
-	constructor(private readonly subscriber: Subscriber) {
-		super();
-	}
-
-	async initSubscriber(options: WorkerCommandReceivedHandlerOptions) {
-		await this.subscriber.subscribe('n8n.commands');
-
-		this.subscriber.setMessageHandler('n8n.commands', async (message: string) => {
-			await getWorkerCommandReceivedHandler(message, options);
-		});
-	}
-}
diff --git a/packages/cli/src/services/pruning.service.ts b/packages/cli/src/services/pruning.service.ts
index b0ebc99dfd..48d4b0db3b 100644
--- a/packages/cli/src/services/pruning.service.ts
+++ b/packages/cli/src/services/pruning.service.ts
@@ -6,7 +6,7 @@ import config from '@/config';
 import { inTest, TIME } from '@/constants';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { OnShutdown } from '@/decorators/on-shutdown';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import { OrchestrationService } from './orchestration.service';
 
diff --git a/packages/cli/src/services/public-api-key.service.ts b/packages/cli/src/services/public-api-key.service.ts
new file mode 100644
index 0000000000..e689f3c019
--- /dev/null
+++ b/packages/cli/src/services/public-api-key.service.ts
@@ -0,0 +1,80 @@
+import { randomBytes } from 'node:crypto';
+import Container, { Service } from 'typedi';
+
+import { ApiKey } from '@/databases/entities/api-key';
+import type { User } from '@/databases/entities/user';
+import { ApiKeyRepository } from '@/databases/repositories/api-key.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
+
+export const API_KEY_PREFIX = 'n8n_api_';
+
+@Service()
+export class PublicApiKeyService {
+	constructor(private readonly apiKeyRepository: ApiKeyRepository) {}
+
+	/**
+	 * Creates a new public API key for the specified user.
+	 * @param user - The user for whom the API key is being created.
+	 * @returns A promise that resolves to the newly created API key.
+	 */
+	async createPublicApiKeyForUser(user: User) {
+		const apiKey = this.createApiKeyString();
+		await this.apiKeyRepository.upsert(
+			this.apiKeyRepository.create({
+				userId: user.id,
+				apiKey,
+				label: 'My API Key',
+			}),
+			['apiKey'],
+		);
+
+		return await this.apiKeyRepository.findOneByOrFail({ apiKey });
+	}
+
+	/**
+	 * Retrieves and redacts API keys for a given user.
+	 * @param user - The user for whom to retrieve and redact API keys.
+	 * @returns A promise that resolves to an array of objects containing redacted API keys.
+	 */
+	async getRedactedApiKeysForUser(user: User) {
+		const apiKeys = await this.apiKeyRepository.findBy({ userId: user.id });
+		return apiKeys.map((apiKeyRecord) => ({
+			...apiKeyRecord,
+			apiKey: this.redactApiKey(apiKeyRecord.apiKey),
+		}));
+	}
+
+	async deleteApiKeyForUser(user: User, apiKeyId: string) {
+		await this.apiKeyRepository.delete({ userId: user.id, id: apiKeyId });
+	}
+
+	async getUserForApiKey(apiKey: string) {
+		return await Container.get(UserRepository)
+			.createQueryBuilder('user')
+			.innerJoin(ApiKey, 'apiKey', 'apiKey.userId = user.id')
+			.where('apiKey.apiKey = :apiKey', { apiKey })
+			.select('user')
+			.getOne();
+	}
+
+	/**
+	 * Redacts an API key by keeping the first few characters and replacing the rest with asterisks.
+	 * @param apiKey - The API key to be redacted. If null, the function returns undefined.
+	 * @returns The redacted API key with a fixed prefix and asterisks replacing the rest of the characters.
+	 * @example
+	 * ```typescript
+	 * const redactedKey = PublicApiKeyService.redactApiKey('12345-abcdef-67890');
+	 * console.log(redactedKey); // Output: '12345-*****'
+	 * ```
+	 */
+	redactApiKey(apiKey: string) {
+		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)
+		);
+	}
+
+	createApiKeyString = () => `${API_KEY_PREFIX}${randomBytes(40).toString('hex')}`;
+}
diff --git a/packages/cli/src/services/redis-client.service.ts b/packages/cli/src/services/redis-client.service.ts
index dc0d3b8cde..5eaa6edc1d 100644
--- a/packages/cli/src/services/redis-client.service.ts
+++ b/packages/cli/src/services/redis-client.service.ts
@@ -3,18 +3,46 @@ import ioRedis from 'ioredis';
 import type { Cluster, RedisOptions } from 'ioredis';
 import { Service } from 'typedi';
 
-import { Logger } from '@/logger';
+import { Debounce } from '@/decorators/debounce';
+import { Logger } from '@/logging/logger.service';
+import { TypedEmitter } from '@/typed-emitter';
 
 import type { RedisClientType } from '../scaling/redis/redis.types';
 
+type RedisEventMap = {
+	'connection-lost': number;
+	'connection-recovered': never;
+};
+
 @Service()
-export class RedisClientService {
+export class RedisClientService extends TypedEmitter<RedisEventMap> {
 	private readonly clients = new Set<ioRedis | Cluster>();
 
+	private readonly config = {
+		/** How long (in ms) to try to reconnect for before exiting. */
+		maxTimeout: this.globalConfig.queue.bull.redis.timeoutThreshold,
+
+		/** How long (in ms) to wait between reconnection attempts. */
+		retryInterval: 1000,
+
+		/** How long (in ms) to wait before resetting the cumulative timeout. */
+		resetLength: 30_000,
+	};
+
+	/** Whether any client has lost connection to Redis. */
+	private lostConnection = false;
+
 	constructor(
 		private readonly logger: Logger,
 		private readonly globalConfig: GlobalConfig,
-	) {}
+	) {
+		super();
+		this.registerListeners();
+	}
+
+	isConnected() {
+		return !this.lostConnection;
+	}
 
 	createClient(arg: { type: RedisClientType; extraOptions?: RedisOptions }) {
 		const client =
@@ -22,6 +50,19 @@ export class RedisClientService {
 				? this.createClusterClient(arg)
 				: this.createRegularClient(arg);
 
+		client.on('error', (error) => {
+			if ('code' in error && error.code === 'ECONNREFUSED') return; // handled by retryStrategy
+
+			this.logger.error(`[Redis client] ${error.message}`, { error });
+		});
+
+		client.on('ready', () => {
+			if (this.lostConnection) {
+				this.emit('connection-recovered');
+				this.lostConnection = false;
+			}
+		});
+
 		this.clients.add(client);
 
 		return client;
@@ -118,32 +159,29 @@ export class RedisClientService {
 	 * Reset the cumulative timeout if >30s between reconnection attempts.
 	 */
 	private retryStrategy() {
-		const RETRY_INTERVAL = 500; // ms
-		const RESET_LENGTH = 30_000; // ms
-		const MAX_TIMEOUT = this.globalConfig.queue.bull.redis.timeoutThreshold;
-
 		let lastAttemptTs = 0;
 		let cumulativeTimeout = 0;
 
 		return () => {
 			const nowTs = Date.now();
 
-			if (nowTs - lastAttemptTs > RESET_LENGTH) {
+			if (nowTs - lastAttemptTs > this.config.resetLength) {
 				cumulativeTimeout = 0;
 				lastAttemptTs = nowTs;
 			} else {
 				cumulativeTimeout += nowTs - lastAttemptTs;
 				lastAttemptTs = nowTs;
-				if (cumulativeTimeout > MAX_TIMEOUT) {
-					this.logger.error(`[Redis] Unable to connect after max timeout of ${MAX_TIMEOUT} ms`);
-					this.logger.error('Exiting process...');
+				if (cumulativeTimeout > this.config.maxTimeout) {
+					const maxTimeout = Math.round(this.config.maxTimeout / 1000) + 's';
+					this.logger.error(`Unable to connect to Redis after trying to connect for ${maxTimeout}`);
+					this.logger.error('Exiting process due to Redis connection error');
 					process.exit(1);
 				}
 			}
 
-			this.logger.warn('Redis unavailable - trying to reconnect...');
+			this.emit('connection-lost', cumulativeTimeout);
 
-			return RETRY_INTERVAL;
+			return this.config.retryInterval;
 		};
 	}
 
@@ -156,4 +194,40 @@ export class RedisClientService {
 				return { host, port: parseInt(port) };
 			});
 	}
+
+	@Debounce(1000)
+	emit<Event extends keyof RedisEventMap>(
+		event: Event,
+		...args: Array<RedisEventMap[Event]>
+	): boolean {
+		return super.emit(event, ...args);
+	}
+
+	private registerListeners() {
+		const { maxTimeout: maxTimeoutMs, retryInterval: retryIntervalMs } = this.config;
+
+		const retryInterval = this.formatTimeout(retryIntervalMs);
+		const maxTimeout = this.formatTimeout(maxTimeoutMs);
+
+		this.on('connection-lost', (cumulativeTimeoutMs) => {
+			const cumulativeTimeout = this.formatTimeout(cumulativeTimeoutMs);
+			const reconnectionMsg = `Trying to reconnect in ${retryInterval}...`;
+			const timeoutDetails = `${cumulativeTimeout}/${maxTimeout}`;
+
+			this.logger.warn(`Lost Redis connection. ${reconnectionMsg} (${timeoutDetails})`);
+
+			this.lostConnection = true;
+		});
+
+		this.on('connection-recovered', () => {
+			this.logger.info('Recovered Redis connection');
+		});
+	}
+
+	private formatTimeout(timeoutMs: number) {
+		const timeoutSeconds = timeoutMs / 1000;
+		const roundedTimeout = Math.round(timeoutSeconds * 10) / 10;
+
+		return roundedTimeout + 's';
+	}
 }
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index 259a30666c..1668878a8c 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -7,7 +7,7 @@ import { UserRepository } from '@/databases/repositories/user.repository';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { EventService } from '@/events/event.service';
 import type { Invitation, PublicUser } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import type { PostHogClient } from '@/posthog';
 import type { UserRequest } from '@/requests';
 import { UrlService } from '@/services/url.service';
@@ -58,7 +58,7 @@ export class UserService {
 			withScopes?: boolean;
 		},
 	) {
-		const { password, updatedAt, apiKey, authIdentities, ...rest } = user;
+		const { password, updatedAt, authIdentities, ...rest } = user;
 
 		const ldapIdentity = authIdentities?.find((i) => i.providerType === 'ldap');
 
diff --git a/packages/cli/src/services/workflow-import.service.ts b/packages/cli/src/services/workflow-import.service.ts
index c509dfbc12..86ba742ef6 100644
--- a/packages/cli/src/services/workflow-import.service.ts
+++ b/packages/cli/src/services/workflow-import.service.ts
@@ -11,7 +11,7 @@ import { CredentialsRepository } from '@/databases/repositories/credentials.repo
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import * as Db from '@/db';
 import type { ICredentialsDb } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { replaceInvalidCredentials } from '@/workflow-helpers';
 
 @Service()
@@ -88,8 +88,7 @@ export class WorkflowImportService {
 		try {
 			await replaceInvalidCredentials(workflow);
 		} catch (e) {
-			const error = e instanceof Error ? e : new Error(`${e}`);
-			this.logger.error('Failed to replace invalid credential', error);
+			this.logger.error('Failed to replace invalid credential', { error: e });
 		}
 	}
 
diff --git a/packages/cli/src/services/workflow-statistics.service.ts b/packages/cli/src/services/workflow-statistics.service.ts
index 42c6d14638..53cbac5094 100644
--- a/packages/cli/src/services/workflow-statistics.service.ts
+++ b/packages/cli/src/services/workflow-statistics.service.ts
@@ -4,7 +4,7 @@ import { Service } from 'typedi';
 import { StatisticsNames } from '@/databases/entities/workflow-statistics';
 import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { UserService } from '@/services/user.service';
 import { TypedEmitter } from '@/typed-emitter';
 
@@ -110,7 +110,7 @@ export class WorkflowStatisticsService extends TypedEmitter<WorkflowStatisticsEv
 		const owner = await this.ownershipService.getPersonalProjectOwnerCached(project.id);
 
 		let metrics = {
-			userId: owner!.id,
+			userId: owner?.id ?? '', // team projects have no owner
 			project: project.id,
 			workflowId,
 			nodeType: node.type,
diff --git a/packages/cli/src/shutdown/shutdown.service.ts b/packages/cli/src/shutdown/shutdown.service.ts
index 8e2c1f3884..1bedc3a7d4 100644
--- a/packages/cli/src/shutdown/shutdown.service.ts
+++ b/packages/cli/src/shutdown/shutdown.service.ts
@@ -3,7 +3,7 @@ import { ApplicationError, ErrorReporterProxy, assert } from 'n8n-workflow';
 import { Container, Service } from 'typedi';
 
 import { LOWEST_SHUTDOWN_PRIORITY, HIGHEST_SHUTDOWN_PRIORITY } from '@/constants';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 type HandlerFn = () => Promise<void> | void;
 export type ServiceClass = Class<Record<string, HandlerFn>>;
diff --git a/packages/cli/src/sse-channel.d.ts b/packages/cli/src/sse-channel.d.ts
deleted file mode 100644
index 6ea435b361..0000000000
--- a/packages/cli/src/sse-channel.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { PushRequest, PushResponse } from './push/types';
-
-declare module 'sse-channel' {
-	declare class Channel {
-		constructor();
-
-		on(event: string, handler: (channel: string, res: PushResponse) => void): void;
-
-		removeClient: (res: PushResponse) => void;
-
-		addClient: (req: PushRequest, res: PushResponse) => void;
-
-		send: (msg: string, clients?: PushResponse[]) => void;
-	}
-
-	export = Channel;
-}
diff --git a/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts b/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts
index 418f29c688..5dda04dc18 100644
--- a/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts
+++ b/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts
@@ -2,7 +2,7 @@ import type express from 'express';
 import { mock } from 'jest-mock-extended';
 import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
 
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { UrlService } from '@/services/url.service';
 import * as samlHelpers from '@/sso/saml/saml-helpers';
 import { SamlService } from '@/sso/saml/saml.service.ee';
diff --git a/packages/cli/src/sso/saml/saml-validator.ts b/packages/cli/src/sso/saml/saml-validator.ts
index 6705320bee..06a93cc4fb 100644
--- a/packages/cli/src/sso/saml/saml-validator.ts
+++ b/packages/cli/src/sso/saml/saml-validator.ts
@@ -1,7 +1,7 @@
 import { Container } from 'typedi';
 import type { XMLFileInfo } from 'xmllint-wasm';
 
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 let xml: XMLFileInfo;
 let xmldsigCore: XMLFileInfo;
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index f30fa6ff8e..6b07919730 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -12,7 +12,7 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { UrlService } from '@/services/url.service';
 
 import { SAML_PREFERENCES_DB_KEY } from './constants';
diff --git a/packages/cli/src/subworkflows/subworkflow-policy-checker.service.ts b/packages/cli/src/subworkflows/subworkflow-policy-checker.service.ts
index f630392280..cf9b122e72 100644
--- a/packages/cli/src/subworkflows/subworkflow-policy-checker.service.ts
+++ b/packages/cli/src/subworkflows/subworkflow-policy-checker.service.ts
@@ -5,7 +5,7 @@ import { Service } from 'typedi';
 
 import type { Project } from '@/databases/entities/project';
 import { SubworkflowPolicyDenialError } from '@/errors/subworkflow-policy-denial.error';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { AccessService } from '@/services/access.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { UrlService } from '@/services/url.service';
diff --git a/packages/cli/src/telemetry/__tests__/telemetry.test.ts b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
index 3851e4523a..04a6cecfca 100644
--- a/packages/cli/src/telemetry/__tests__/telemetry.test.ts
+++ b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
@@ -1,3 +1,4 @@
+import type { GlobalConfig } from '@n8n/config';
 import type RudderStack from '@rudderstack/rudder-sdk-node';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
@@ -41,10 +42,17 @@ describe('Telemetry', () => {
 	beforeEach(async () => {
 		spyTrack.mockClear();
 
-		const postHog = new PostHogClient(instanceSettings);
+		const postHog = new PostHogClient(instanceSettings, mock());
 		await postHog.init();
 
-		telemetry = new Telemetry(mock(), postHog, mock(), instanceSettings, mock());
+		telemetry = new Telemetry(
+			mock(),
+			postHog,
+			mock(),
+			instanceSettings,
+			mock(),
+			mock<GlobalConfig>({ logging: { level: 'info', outputs: ['console'] } }),
+		);
 		// @ts-expect-error Assigning to private property
 		telemetry.rudderStack = mockRudderStack;
 	});
@@ -259,6 +267,44 @@ describe('Telemetry', () => {
 			expect(execBuffer['2'].prod_success?.first).toEqual(execTime1);
 		});
 	});
+
+	describe('Rudderstack', () => {
+		test("should call rudderStack.identify() with a fake IP address to instruct Rudderstack to not use the user's IP address", () => {
+			const traits = {
+				name: 'Test User',
+				age: 30,
+				isActive: true,
+			};
+
+			telemetry.identify(traits);
+
+			const expectedArgs = {
+				userId: instanceId,
+				traits: { ...traits, instanceId },
+				context: {
+					ip: '0.0.0.0', // RudderStack anonymized IP
+				},
+			};
+
+			expect(mockRudderStack.identify).toHaveBeenCalledWith(expectedArgs);
+		});
+
+		test("should call rudderStack.track() with a fake IP address to instruct Rudderstack to not use the user's IP address", () => {
+			const eventName = 'Test Event';
+			const properties = { user_id: '1234' };
+
+			telemetry.track(eventName, properties);
+
+			expect(mockRudderStack.track).toHaveBeenCalledWith(
+				expect.objectContaining({
+					event: eventName,
+					context: {
+						ip: '0.0.0.0', // RudderStack anonymized IP
+					},
+				}),
+			);
+		});
+	});
 });
 
 const fakeJestSystemTime = (dateTime: string | Date): Date => {
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 8ffca478c1..d9a8e590f4 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -1,3 +1,4 @@
+import { GlobalConfig } from '@n8n/config';
 import type RudderStack from '@rudderstack/rudder-sdk-node';
 import axios from 'axios';
 import { InstanceSettings } from 'n8n-core';
@@ -13,7 +14,7 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository
 import { OnShutdown } from '@/decorators/on-shutdown';
 import type { IExecutionTrackProperties } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { PostHogClient } from '@/posthog';
 
 import { SourceControlPreferencesService } from '../environments/source-control/source-control-preferences.service.ee';
@@ -49,6 +50,7 @@ export class Telemetry {
 		private readonly license: License,
 		private readonly instanceSettings: InstanceSettings,
 		private readonly workflowRepository: WorkflowRepository,
+		private readonly globalConfig: GlobalConfig,
 	) {}
 
 	async init() {
@@ -62,7 +64,7 @@ export class Telemetry {
 				return;
 			}
 
-			const logLevel = config.getEnv('logs.level');
+			const logLevel = this.globalConfig.logging.level;
 
 			const { default: RudderStack } = await import('@rudderstack/rudder-sdk-node');
 			const axiosInstance = axios.create();
@@ -186,6 +188,10 @@ export class Telemetry {
 		this.rudderStack.identify({
 			userId: instanceId,
 			traits: { ...traits, instanceId },
+			context: {
+				// provide a fake IP address to instruct RudderStack to not use the user's IP address
+				ip: '0.0.0.0',
+			},
 		});
 	}
 
@@ -210,13 +216,18 @@ export class Telemetry {
 			userId: `${instanceId}${user_id ? `#${user_id}` : ''}`,
 			event: eventName,
 			properties: updatedProperties,
+			context: {},
 		};
 
 		if (withPostHog) {
 			this.postHog?.track(payload);
 		}
 
-		return this.rudderStack.track(payload);
+		return this.rudderStack.track({
+			...payload,
+			// provide a fake IP address to instruct RudderStack to not use the user's IP address
+			context: { ...payload.context, ip: '0.0.0.0' },
+		});
 	}
 
 	// test helpers
diff --git a/packages/cli/src/user-management/email/node-mailer.ts b/packages/cli/src/user-management/email/node-mailer.ts
index cfc7247546..661c3fed7f 100644
--- a/packages/cli/src/user-management/email/node-mailer.ts
+++ b/packages/cli/src/user-management/email/node-mailer.ts
@@ -7,7 +7,7 @@ import { createTransport } from 'nodemailer';
 import type SMTPConnection from 'nodemailer/lib/smtp-connection';
 import { Service } from 'typedi';
 
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import type { MailData, SendEmailResult } from './interfaces';
 
diff --git a/packages/cli/src/user-management/email/user-management-mailer.ts b/packages/cli/src/user-management/email/user-management-mailer.ts
index 6703354f07..b5df958d7d 100644
--- a/packages/cli/src/user-management/email/user-management-mailer.ts
+++ b/packages/cli/src/user-management/email/user-management-mailer.ts
@@ -11,7 +11,7 @@ import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { UrlService } from '@/services/url.service';
 import { toError } from '@/utils';
 
diff --git a/packages/cli/src/utils/__tests__/path-util.test.ts b/packages/cli/src/utils/__tests__/path-util.test.ts
new file mode 100644
index 0000000000..d67e97f9e0
--- /dev/null
+++ b/packages/cli/src/utils/__tests__/path-util.test.ts
@@ -0,0 +1,24 @@
+import { isContainedWithin } from '../path-util';
+
+describe('isContainedWithin', () => {
+	it('should return true when parent and child paths are the same', () => {
+		expect(isContainedWithin('/some/parent/folder', '/some/parent/folder')).toBe(true);
+	});
+
+	test.each([
+		['/some/parent/folder', '/some/parent/folder/subfolder/file.txt'],
+		['/some/parent/folder', '/some/parent/folder/../folder/subfolder/file.txt'],
+		['/some/parent/folder/', '/some/parent/folder/subfolder/file.txt'],
+		['/some/parent/folder', '/some/parent/folder/subfolder/'],
+	])('should return true for parent %s and child %s', (parent, child) => {
+		expect(isContainedWithin(parent, child)).toBe(true);
+	});
+
+	test.each([
+		['/some/parent/folder', '/some/other/folder/file.txt'],
+		['/some/parent/folder', '/some/parent/folder_but_not_really'],
+		['/one/path', '/another/path'],
+	])('should return false for parent %s and child %s', (parent, child) => {
+		expect(isContainedWithin(parent, child)).toBe(false);
+	});
+});
diff --git a/packages/cli/src/utils/path-util.ts b/packages/cli/src/utils/path-util.ts
new file mode 100644
index 0000000000..f42dc01890
--- /dev/null
+++ b/packages/cli/src/utils/path-util.ts
@@ -0,0 +1,16 @@
+import * as path from 'node:path';
+
+/**
+ * Checks if the given childPath is contained within the parentPath. Resolves
+ * the paths before comparing them, so that relative paths are also supported.
+ */
+export function isContainedWithin(parentPath: string, childPath: string): boolean {
+	parentPath = path.resolve(parentPath);
+	childPath = path.resolve(childPath);
+
+	if (parentPath === childPath) {
+		return true;
+	}
+
+	return childPath.startsWith(parentPath + path.sep);
+}
diff --git a/packages/cli/src/utlity.types.ts b/packages/cli/src/utlity.types.ts
new file mode 100644
index 0000000000..c126a31717
--- /dev/null
+++ b/packages/cli/src/utlity.types.ts
@@ -0,0 +1,6 @@
+/**
+ * Display an intersection type without implementation details.
+ * @doc https://effectivetypescript.com/2022/02/25/gentips-4-display/
+ */
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type Resolve<T> = T extends Function ? T : { [K in keyof T]: T[K] };
diff --git a/packages/cli/src/wait-tracker.ts b/packages/cli/src/wait-tracker.ts
index 7792cf5285..e999c30401 100644
--- a/packages/cli/src/wait-tracker.ts
+++ b/packages/cli/src/wait-tracker.ts
@@ -6,7 +6,7 @@ import {
 import { Service } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { WorkflowRunner } from '@/workflow-runner';
@@ -28,7 +28,9 @@ export class WaitTracker {
 		private readonly ownershipService: OwnershipService,
 		private readonly workflowRunner: WorkflowRunner,
 		private readonly orchestrationService: OrchestrationService,
-	) {}
+	) {
+		this.logger = this.logger.withScope('executions');
+	}
 
 	has(executionId: string) {
 		return this.waitingExecutions[executionId] !== undefined;
@@ -50,7 +52,7 @@ export class WaitTracker {
 	}
 
 	private startTracking() {
-		this.logger.debug('Wait tracker started tracking waiting executions');
+		this.logger.debug('Started tracking waiting executions');
 
 		// Poll every 60 seconds a list of upcoming executions
 		this.mainTimer = setInterval(() => {
@@ -61,7 +63,7 @@ export class WaitTracker {
 	}
 
 	async getWaitingExecutions() {
-		this.logger.debug('Wait tracker querying database for waiting executions');
+		this.logger.debug('Querying database for waiting executions');
 
 		const executions = await this.executionRepository.getWaitingExecutions();
 
@@ -71,7 +73,7 @@ export class WaitTracker {
 
 		const executionIds = executions.map((execution) => execution.id).join(', ');
 		this.logger.debug(
-			`Wait tracker found ${executions.length} executions. Setting timer for IDs: ${executionIds}`,
+			`Found ${executions.length} executions. Setting timer for IDs: ${executionIds}`,
 		);
 
 		// Add timers for each waiting execution that they get started at the correct time
@@ -99,7 +101,7 @@ export class WaitTracker {
 	}
 
 	startExecution(executionId: string) {
-		this.logger.debug(`Wait tracker resuming execution ${executionId}`, { executionId });
+		this.logger.debug(`Resuming execution ${executionId}`, { executionId });
 		delete this.waitingExecutions[executionId];
 
 		(async () => {
@@ -141,7 +143,7 @@ export class WaitTracker {
 	}
 
 	stopTracking() {
-		this.logger.debug('Wait tracker shutting down');
+		this.logger.debug('Shutting down wait tracking');
 
 		clearInterval(this.mainTimer);
 		Object.keys(this.waitingExecutions).forEach((executionId) => {
diff --git a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
index 7a8dd8b854..892d87e773 100644
--- a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
@@ -63,7 +63,7 @@ describe('WaitingWebhooks', () => {
 		 * Arrange
 		 */
 		executionRepository.findSingleExecution.mockResolvedValue(
-			mock<IExecutionResponse>({ finished: true }),
+			mock<IExecutionResponse>({ finished: true, workflowData: { nodes: [] } }),
 		);
 
 		/**
diff --git a/packages/cli/src/webhooks/live-webhooks.ts b/packages/cli/src/webhooks/live-webhooks.ts
index e9314060d7..458701caee 100644
--- a/packages/cli/src/webhooks/live-webhooks.ts
+++ b/packages/cli/src/webhooks/live-webhooks.ts
@@ -1,12 +1,12 @@
 import type { Response } from 'express';
-import { Workflow, NodeHelpers } from 'n8n-workflow';
+import { Workflow, NodeHelpers, CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow';
 import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import { WebhookService } from '@/webhooks/webhook.service';
@@ -47,12 +47,18 @@ export class LiveWebhooks implements IWebhookManager {
 			select: ['nodes'],
 		});
 
+		const isChatWebhookNode = (type: string, webhookId?: string) =>
+			type === CHAT_TRIGGER_NODE_TYPE && `${webhookId}/chat` === path;
+
 		const nodes = workflowData?.nodes;
 		const webhookNode = nodes?.find(
-			({ type, parameters, typeVersion }) =>
-				parameters?.path === path &&
-				(parameters?.httpMethod ?? 'GET') === httpMethod &&
-				'webhook' in this.nodeTypes.getByNameAndVersion(type, typeVersion),
+			({ type, parameters, typeVersion, webhookId }) =>
+				(parameters?.path === path &&
+					(parameters?.httpMethod ?? 'GET') === httpMethod &&
+					'webhook' in this.nodeTypes.getByNameAndVersion(type, typeVersion)) ||
+				// Chat Trigger has doesn't have configurable path and is always using POST, so
+				// we need to use webhookId for matching
+				isChatWebhookNode(type, webhookId),
 		);
 		return webhookNode?.parameters?.options as WebhookAccessControlOptions;
 	}
@@ -154,8 +160,9 @@ export class LiveWebhooks implements IWebhookManager {
 		}
 
 		const webhook = await this.webhookService.findWebhook(httpMethod, path);
+		const webhookMethods = await this.getWebhookMethods(path);
 		if (webhook === null) {
-			throw new WebhookNotFoundError({ path, httpMethod }, { hint: 'production' });
+			throw new WebhookNotFoundError({ path, httpMethod, webhookMethods }, { hint: 'production' });
 		}
 
 		return webhook;
diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts
index 6493fde981..e644c065f3 100644
--- a/packages/cli/src/webhooks/waiting-webhooks.ts
+++ b/packages/cli/src/webhooks/waiting-webhooks.ts
@@ -1,12 +1,18 @@
 import type express from 'express';
-import { NodeHelpers, Workflow } from 'n8n-workflow';
+import {
+	type INodes,
+	type IWorkflowBase,
+	NodeHelpers,
+	SEND_AND_WAIT_OPERATION,
+	Workflow,
+} from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { ConflictError } from '@/errors/response-errors/conflict.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import type { IExecutionResponse, IWorkflowDb } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
@@ -42,6 +48,29 @@ export class WaitingWebhooks implements IWebhookManager {
 		execution.data.executionData!.nodeExecutionStack[0].node.disabled = true;
 	}
 
+	private isSendAndWaitRequest(nodes: INodes, suffix: string | undefined) {
+		return (
+			suffix &&
+			Object.keys(nodes).some(
+				(node) =>
+					nodes[node].id === suffix && nodes[node].parameters.operation === SEND_AND_WAIT_OPERATION,
+			)
+		);
+	}
+
+	private getWorkflow(workflowData: IWorkflowBase) {
+		return new Workflow({
+			id: workflowData.id,
+			name: workflowData.name,
+			nodes: workflowData.nodes,
+			connections: workflowData.connections,
+			active: workflowData.active,
+			nodeTypes: this.nodeTypes,
+			staticData: workflowData.staticData,
+			settings: workflowData.settings,
+		});
+	}
+
 	async executeWebhook(
 		req: WaitingWebhookRequest,
 		res: express.Response,
@@ -66,10 +95,21 @@ export class WaitingWebhooks implements IWebhookManager {
 			throw new ConflictError(`The execution "${executionId} is running already.`);
 		}
 
-		if (execution.finished || execution.data.resultData.error) {
+		if (execution.data?.resultData?.error) {
 			throw new ConflictError(`The execution "${executionId} has finished already.`);
 		}
 
+		if (execution.finished) {
+			const { workflowData } = execution;
+			const { nodes } = this.getWorkflow(workflowData);
+			if (this.isSendAndWaitRequest(nodes, suffix)) {
+				res.render('send-and-wait-no-action-required', { isTestWebhook: false });
+				return { noWebhookResponse: true };
+			} else {
+				throw new ConflictError(`The execution "${executionId} has finished already.`);
+			}
+		}
+
 		const lastNodeExecuted = execution.data.resultData.lastNodeExecuted as string;
 
 		// Set the node as disabled so that the data does not get executed again as it would result
@@ -83,17 +123,7 @@ export class WaitingWebhooks implements IWebhookManager {
 		execution.data.resultData.runData[lastNodeExecuted].pop();
 
 		const { workflowData } = execution;
-
-		const workflow = new Workflow({
-			id: workflowData.id,
-			name: workflowData.name,
-			nodes: workflowData.nodes,
-			connections: workflowData.connections,
-			active: workflowData.active,
-			nodeTypes: this.nodeTypes,
-			staticData: workflowData.staticData,
-			settings: workflowData.settings,
-		});
+		const workflow = this.getWorkflow(workflowData);
 
 		const workflowStartNode = workflow.getNode(lastNodeExecuted);
 		if (workflowStartNode === null) {
@@ -116,8 +146,13 @@ export class WaitingWebhooks implements IWebhookManager {
 		if (webhookData === undefined) {
 			// If no data got found it means that the execution can not be started via a webhook.
 			// Return 404 because we do not want to give any data if the execution exists or not.
-			const errorMessage = `The workflow for execution "${executionId}" does not contain a waiting webhook with a matching path/method.`;
-			throw new NotFoundError(errorMessage);
+			if (this.isSendAndWaitRequest(workflow.nodes, suffix)) {
+				res.render('send-and-wait-no-action-required', { isTestWebhook: false });
+				return { noWebhookResponse: true };
+			} else {
+				const errorMessage = `The workflow for execution "${executionId}" does not contain a waiting webhook with a matching path/method.`;
+				throw new NotFoundError(errorMessage);
+			}
 		}
 
 		const runExecutionData = execution.data;
diff --git a/packages/cli/src/webhooks/webhook-helpers.ts b/packages/cli/src/webhooks/webhook-helpers.ts
index c2c3b59bff..5ff770acfb 100644
--- a/packages/cli/src/webhooks/webhook-helpers.ts
+++ b/packages/cli/src/webhooks/webhook-helpers.ts
@@ -45,7 +45,7 @@ import { InternalServerError } from '@/errors/response-errors/internal-server.er
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error';
 import type { IExecutionDb, IWorkflowDb } from '@/interfaces';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { parseBody } from '@/middlewares';
 import { OwnershipService } from '@/services/ownership.service';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts
index 4d3bd7a223..2deae842fc 100644
--- a/packages/cli/src/workflow-execute-additional-data.ts
+++ b/packages/cli/src/workflow-execute-additional-data.ts
@@ -6,6 +6,13 @@
 import type { PushType } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 import { WorkflowExecute } from 'n8n-core';
+import {
+	ApplicationError,
+	ErrorReporterProxy as ErrorReporter,
+	NodeOperationError,
+	Workflow,
+	WorkflowHooks,
+} from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteData,
@@ -24,15 +31,11 @@ import type {
 	WorkflowExecuteMode,
 	ExecutionStatus,
 	ExecutionError,
+	IExecuteFunctions,
+	ITaskDataConnections,
 	ExecuteWorkflowOptions,
 	IWorkflowExecutionDataProcess,
-} from 'n8n-workflow';
-import {
-	ApplicationError,
-	ErrorReporterProxy as ErrorReporter,
-	NodeOperationError,
-	Workflow,
-	WorkflowHooks,
+	EnvProviderState,
 } from 'n8n-workflow';
 import { Container } from 'typedi';
 
@@ -40,8 +43,13 @@ import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
 import { CredentialsHelper } from '@/credentials-helper';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { AiEventMap, AiEventPayload } from '@/events/maps/ai.event-map';
 import { ExternalHooks } from '@/external-hooks';
-import type { IWorkflowExecuteProcess, IWorkflowErrorData, ExecutionPayload } from '@/interfaces';
+import type {
+	IWorkflowExecuteProcess,
+	IWorkflowErrorData,
+	UpdateExecutionPayload,
+} from '@/interfaces';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
@@ -49,7 +57,6 @@ import { findSubworkflowStart, isWorkflowIdValid } from '@/utils';
 import * as WorkflowHelpers from '@/workflow-helpers';
 
 import { WorkflowRepository } from './databases/repositories/workflow.repository';
-import type { AiEventMap, AiEventPayload } from './events/ai-event-map';
 import { EventService } from './events/event.service';
 import { restoreBinaryDataId } from './execution-lifecycle-hooks/restore-binary-data-id';
 import { saveExecutionProgress } from './execution-lifecycle-hooks/save-execution-progress';
@@ -59,7 +66,8 @@ import {
 	updateExistingExecution,
 } from './execution-lifecycle-hooks/shared/shared-hook-functions';
 import { toSaveSettings } from './execution-lifecycle-hooks/to-save-settings';
-import { Logger } from './logger';
+import { Logger } from './logging/logger.service';
+import { TaskManager } from './runners/task-managers/task-manager';
 import { SecretsHelper } from './secrets-helpers';
 import { OwnershipService } from './services/ownership.service';
 import { UrlService } from './services/url.service';
@@ -759,7 +767,7 @@ export async function getWorkflowData(
 /**
  * Executes the workflow with the given ID
  */
-async function executeWorkflow(
+export async function executeWorkflow(
 	workflowInfo: IExecuteWorkflowInfo,
 	additionalData: IWorkflowExecuteAdditionalData,
 	options: ExecuteWorkflowOptions,
@@ -791,7 +799,13 @@ async function executeWorkflow(
 	const runData = options.loadedRunData ?? (await getRunData(workflowData, options.inputData));
 
 	const executionId = await activeExecutions.add(runData);
-	await executionRepository.updateStatus(executionId, 'running');
+
+	/**
+	 * A subworkflow execution in queue mode is not enqueued, but rather runs in the
+	 * same worker process as the parent execution. Hence ensure the subworkflow
+	 * execution is marked as started as well.
+	 */
+	await executionRepository.setRunning(executionId);
 
 	Container.get(EventService).emit('workflow-pre-execute', { executionId, data: runData });
 
@@ -865,7 +879,7 @@ async function executeWorkflow(
 		// Therefore, database might not contain finished errors.
 		// Force an update to db as there should be no harm doing this
 
-		const fullExecutionData: ExecutionPayload = {
+		const fullExecutionData: UpdateExecutionPayload = {
 			data: fullRunData.data,
 			mode: fullRunData.mode,
 			finished: fullRunData.finished ? fullRunData.finished : false,
@@ -980,6 +994,49 @@ export async function getBase(
 		setExecutionStatus,
 		variables,
 		secretsHelpers: Container.get(SecretsHelper),
+		async startAgentJob(
+			additionalData: IWorkflowExecuteAdditionalData,
+			jobType: string,
+			settings: unknown,
+			executeFunctions: IExecuteFunctions,
+			inputData: ITaskDataConnections,
+			node: INode,
+			workflow: Workflow,
+			runExecutionData: IRunExecutionData,
+			runIndex: number,
+			itemIndex: number,
+			activeNodeName: string,
+			connectionInputData: INodeExecutionData[],
+			siblingParameters: INodeParameters,
+			mode: WorkflowExecuteMode,
+			envProviderState: EnvProviderState,
+			executeData?: IExecuteData,
+			defaultReturnRunIndex?: number,
+			selfData?: IDataObject,
+			contextNodeName?: string,
+		) {
+			return await Container.get(TaskManager).startTask(
+				additionalData,
+				jobType,
+				settings,
+				executeFunctions,
+				inputData,
+				node,
+				workflow,
+				runExecutionData,
+				runIndex,
+				itemIndex,
+				activeNodeName,
+				connectionInputData,
+				siblingParameters,
+				mode,
+				envProviderState,
+				executeData,
+				defaultReturnRunIndex,
+				selfData,
+				contextNodeName,
+			);
+		},
 		logAiEvent: (eventName: keyof AiEventMap, payload: AiEventPayload) =>
 			eventService.emit(eventName, payload),
 	};
diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts
index a4dd344b62..8d1e147e85 100644
--- a/packages/cli/src/workflow-runner.ts
+++ b/packages/cli/src/workflow-runner.ts
@@ -26,7 +26,7 @@ import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { ExternalHooks } from '@/external-hooks';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import type { ScalingService } from '@/scaling/scaling.service';
 import type { Job, JobData, JobResult } from '@/scaling/scaling.types';
@@ -245,7 +245,7 @@ export class WorkflowRunner {
 			{ executionId },
 		);
 		let workflowExecution: PCancelable<IRun>;
-		await this.executionRepository.updateStatus(executionId, 'running');
+		await this.executionRepository.setRunning(executionId); // write
 
 		try {
 			additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
@@ -376,22 +376,12 @@ export class WorkflowRunner {
 			this.scalingService = Container.get(ScalingService);
 		}
 
-		let priority = 100;
-		if (realtime === true) {
-			// Jobs which require a direct response get a higher priority
-			priority = 50;
-		}
 		// TODO: For realtime jobs should probably also not do retry or not retry if they are older than x seconds.
 		//       Check if they get retried by default and how often.
-		const jobOptions = {
-			priority,
-			removeOnComplete: true,
-			removeOnFail: true,
-		};
 		let job: Job;
 		let hooks: WorkflowHooks;
 		try {
-			job = await this.scalingService.addJob(jobData, jobOptions);
+			job = await this.scalingService.addJob(jobData, { priority: realtime ? 50 : 100 });
 
 			hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerMain(
 				data.executionMode,
diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts
index 4dc6d00f34..dd8480d759 100644
--- a/packages/cli/src/workflows/workflow-execution.service.ts
+++ b/packages/cli/src/workflows/workflow-execution.service.ts
@@ -22,8 +22,8 @@ import type { Project } from '@/databases/entities/project';
 import type { User } from '@/databases/entities/user';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import type { ExecutionPayload, IWorkflowDb, IWorkflowErrorData } from '@/interfaces';
-import { Logger } from '@/logger';
+import type { CreateExecutionPayload, IWorkflowDb, IWorkflowErrorData } from '@/interfaces';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import { SubworkflowPolicyChecker } from '@/subworkflows/subworkflow-policy-checker.service';
 import { TestWebhooks } from '@/webhooks/test-webhooks';
@@ -206,11 +206,10 @@ export class WorkflowExecutionService {
 						initialNode,
 					);
 
-					const fullExecutionData: ExecutionPayload = {
+					const fullExecutionData: CreateExecutionPayload = {
 						data: fakeExecution.data,
 						mode: fakeExecution.mode,
 						finished: false,
-						startedAt: new Date(),
 						stoppedAt: new Date(),
 						workflowData,
 						waitTill: null,
diff --git a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts b/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts
index 8bc54318bf..a2a48587f0 100644
--- a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts
+++ b/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts
@@ -3,13 +3,12 @@ import { mockClear } from 'jest-mock-extended';
 import { User } from '@/databases/entities/user';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
-import { Logger } from '@/logger';
 import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee';
-import { mockInstance } from '@test/mocking';
+import { mockInstance, mockLogger } from '@test/mocking';
 import { getWorkflow } from '@test-integration/workflow';
 
 const workflowHistoryRepository = mockInstance(WorkflowHistoryRepository);
-const logger = mockInstance(Logger);
+const logger = mockLogger();
 const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
 const workflowHistoryService = new WorkflowHistoryService(
 	logger,
@@ -106,10 +105,6 @@ describe('WorkflowHistoryService', () => {
 
 			// Assert
 			expect(workflowHistoryRepository.insert).toHaveBeenCalled();
-			expect(logger.error).toHaveBeenCalledWith(
-				'Failed to save workflow history version for workflow 123',
-				expect.any(Error),
-			);
 		});
 	});
 });
diff --git a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts b/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts
index 7d40c38ec0..3b171e3422 100644
--- a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts
+++ b/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts
@@ -1,3 +1,4 @@
+import { ensureError } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
@@ -7,7 +8,7 @@ import { SharedWorkflowRepository } from '@/databases/repositories/shared-workfl
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
 import { SharedWorkflowNotFoundError } from '@/errors/shared-workflow-not-found.error';
 import { WorkflowHistoryVersionNotFoundError } from '@/errors/workflow-history-version-not-found.error';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 
 import { isWorkflowHistoryEnabled } from './workflow-history-helper.ee';
 
@@ -79,10 +80,10 @@ export class WorkflowHistoryService {
 					workflowId,
 				});
 			} catch (e) {
-				this.logger.error(
-					`Failed to save workflow history version for workflow ${workflowId}`,
-					e as Error,
-				);
+				const error = ensureError(e);
+				this.logger.error(`Failed to save workflow history version for workflow ${workflowId}`, {
+					error,
+				});
 			}
 		}
 	}
diff --git a/packages/cli/src/workflows/workflow-static-data.service.ts b/packages/cli/src/workflows/workflow-static-data.service.ts
index f639345a1c..10655b77c7 100644
--- a/packages/cli/src/workflows/workflow-static-data.service.ts
+++ b/packages/cli/src/workflows/workflow-static-data.service.ts
@@ -3,7 +3,7 @@ import { type IDataObject, type Workflow, ErrorReporterProxy as ErrorReporter }
 import { Service } from 'typedi';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { isWorkflowIdValid } from '@/utils';
 
 @Service()
diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts
index 5456ac6268..90a8af90b1 100644
--- a/packages/cli/src/workflows/workflow.service.ee.ts
+++ b/packages/cli/src/workflows/workflow.service.ee.ts
@@ -17,7 +17,7 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { TransferWorkflowError } from '@/errors/response-errors/transfer-workflow.error';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { ProjectService } from '@/services/project.service';
 
@@ -285,14 +285,6 @@ export class EnterpriseWorkflowService {
 				"You can't transfer a workflow into the project that's already owning it.",
 			);
 		}
-		if (sourceProject.type !== 'team' && sourceProject.type !== 'personal') {
-			throw new TransferWorkflowError(
-				'You can only transfer workflows out of personal or team projects.',
-			);
-		}
-		if (destinationProject.type !== 'team') {
-			throw new TransferWorkflowError('You can only transfer workflows into team projects.');
-		}
 
 		// 6. deactivate workflow if necessary
 		const wasActive = workflow.active;
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index 03ab425a24..bce8770303 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -24,7 +24,7 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { hasSharing, type ListQuery } from '@/requests';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { OwnershipService } from '@/services/ownership.service';
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 30ca5c9773..59f53e0df1 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -27,7 +27,7 @@ import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
 import type { IWorkflowResponse } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { listQueryMiddleware } from '@/middlewares';
 import * as ResponseHelper from '@/response-helper';
 import { NamingService } from '@/services/naming.service';
diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index 67818629f5..5493a76e7f 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -735,6 +735,14 @@
 							}
 
 							return;
+						}).then(() => {
+							window.addEventListener('storage', function(event) {
+								if (event.key === 'n8n_redirect_to_next_form_test_page' && event.newValue) {
+									const newUrl = event.newValue;
+									localStorage.removeItem('n8n_redirect_to_next_form_test_page');
+									window.location.replace(newUrl);
+								}
+							});
 						})
 						.catch(function (error) {
 							console.error('Error:', error);
diff --git a/packages/cli/templates/send-and-wait-no-action-required.handlebars b/packages/cli/templates/send-and-wait-no-action-required.handlebars
new file mode 100644
index 0000000000..7dcf99f10b
--- /dev/null
+++ b/packages/cli/templates/send-and-wait-no-action-required.handlebars
@@ -0,0 +1,73 @@
+<html lang='en'>
+
+	<head>
+		<meta charset='UTF-8' />
+		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
+		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
+		<link
+			href='http://fonts.googleapis.com/css?family=Open+Sans'
+			rel='stylesheet'
+			type='text/css'
+		/>
+		<title>No action required</title>
+		<style>
+			*, ::after, ::before { box-sizing: border-box; margin: 0; padding: 0; } body { font-family:
+			Open Sans, sans-serif; font-weight: 400; font-size: 12px; display: flex; flex-direction:
+			column; justify-content: start; background-color: #FBFCFE; } .container { margin: auto;
+			text-align: center; padding-top: 24px; width: 448px; } .card { padding: 24px;
+			background-color: white; border: 1px solid #DBDFE7; border-radius: 8px; box-shadow: 0px 4px
+			16px 0px #634DFF0F; margin-bottom: 16px; } .n8n-link a { color: #7E8186; font-weight: 600;
+			font-size: 12px; text-decoration: none; } .n8n-link svg { display: inline-block;
+			vertical-align: middle; } .header h1 { color: #525356; font-size: 20px; font-weight: 400;
+			padding-bottom: 8px; } .header p { color: #7E8186; font-size: 14px; font-weight: 400; }
+		</style>
+	</head>
+
+	<body>
+		<div class='container'>
+			<section>
+				<div class='card'>
+					<div class='header'>
+						<h1>No action required</h1>
+					</div>
+				</div>
+				<div class='n8n-link'>
+					<a
+						href='https://n8n.io/?utm_source=n8n-internal&amp;utm_medium=form-trigger&amp'
+						target='_blank'
+					>
+						Form automated with
+						<svg
+							width='73'
+							height='20'
+							viewBox='0 0 73 20'
+							fill='none'
+							xmlns='http://www.w3.org/2000/svg'
+						>
+							<path
+								fill-rule='evenodd'
+								clip-rule='evenodd'
+								d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
+								fill='#EA4B71'
+							></path>
+							<path
+								d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
+								fill='#101330'
+							></path>
+							<path
+								d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
+								fill='#101330'
+							></path>
+							<path
+								d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
+								fill='#101330'
+							></path>
+						</svg>
+
+					</a>
+				</div>
+			</section>
+		</div>
+	</body>
+
+</html>
\ No newline at end of file
diff --git a/packages/cli/test/integration/api-keys.api.test.ts b/packages/cli/test/integration/api-keys.api.test.ts
new file mode 100644
index 0000000000..f577e0cf78
--- /dev/null
+++ b/packages/cli/test/integration/api-keys.api.test.ts
@@ -0,0 +1,178 @@
+import { GlobalConfig } from '@n8n/config';
+import { Container } from 'typedi';
+
+import type { ApiKey } from '@/databases/entities/api-key';
+import type { User } from '@/databases/entities/user';
+import { ApiKeyRepository } from '@/databases/repositories/api-key.repository';
+import { PublicApiKeyService } from '@/services/public-api-key.service';
+import { mockInstance } from '@test/mocking';
+
+import { createOwnerWithApiKey, createUser, createUserShell } from './shared/db/users';
+import { randomValidPassword } from './shared/random';
+import * as testDb from './shared/test-db';
+import type { SuperAgentTest } from './shared/types';
+import * as utils from './shared/utils/';
+
+const testServer = utils.setupTestServer({ endpointGroups: ['apiKeys'] });
+let publicApiKeyService: PublicApiKeyService;
+
+beforeAll(() => {
+	publicApiKeyService = Container.get(PublicApiKeyService);
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['User']);
+	mockInstance(GlobalConfig, { publicApi: { disabled: false } });
+});
+
+describe('When public API is disabled', () => {
+	let owner: User;
+	let authAgent: SuperAgentTest;
+
+	beforeEach(async () => {
+		owner = await createOwnerWithApiKey();
+
+		authAgent = testServer.authAgentFor(owner);
+		mockInstance(GlobalConfig, { publicApi: { disabled: true } });
+	});
+
+	test('POST /api-keys should 404', async () => {
+		await authAgent.post('/api-keys').expect(404);
+	});
+
+	test('GET /api-keys should 404', async () => {
+		await authAgent.get('/api-keys').expect(404);
+	});
+
+	test('DELETE /api-key/:id should 404', async () => {
+		await authAgent.delete(`/api-keys/${1}`).expect(404);
+	});
+});
+
+describe('Owner shell', () => {
+	let ownerShell: User;
+
+	beforeEach(async () => {
+		ownerShell = await createUserShell('global:owner');
+	});
+
+	test('POST /api-keys should create an api key', async () => {
+		const newApiKeyResponse = await testServer.authAgentFor(ownerShell).post('/api-keys');
+
+		const newApiKey = newApiKeyResponse.body.data as ApiKey;
+
+		expect(newApiKeyResponse.statusCode).toBe(200);
+		expect(newApiKey).toBeDefined();
+
+		const newStoredApiKey = await Container.get(ApiKeyRepository).findOneByOrFail({
+			userId: ownerShell.id,
+		});
+
+		expect(newStoredApiKey).toEqual({
+			id: expect.any(String),
+			label: 'My API Key',
+			userId: ownerShell.id,
+			apiKey: newApiKey.apiKey,
+			createdAt: expect.any(Date),
+			updatedAt: expect.any(Date),
+		});
+	});
+
+	test('GET /api-keys should fetch the api key redacted', async () => {
+		const newApiKeyResponse = await testServer.authAgentFor(ownerShell).post('/api-keys');
+
+		const retrieveAllApiKeysResponse = await testServer.authAgentFor(ownerShell).get('/api-keys');
+
+		expect(retrieveAllApiKeysResponse.statusCode).toBe(200);
+
+		expect(retrieveAllApiKeysResponse.body.data[0]).toEqual({
+			id: newApiKeyResponse.body.data.id,
+			label: 'My API Key',
+			userId: ownerShell.id,
+			apiKey: publicApiKeyService.redactApiKey(newApiKeyResponse.body.data.apiKey),
+			createdAt: expect.any(String),
+			updatedAt: expect.any(String),
+		});
+	});
+
+	test('DELETE /api-keys/:id should delete the api key', async () => {
+		const newApiKeyResponse = await testServer.authAgentFor(ownerShell).post('/api-keys');
+
+		const deleteApiKeyResponse = await testServer
+			.authAgentFor(ownerShell)
+			.delete(`/api-keys/${newApiKeyResponse.body.data.id}`);
+
+		const retrieveAllApiKeysResponse = await testServer.authAgentFor(ownerShell).get('/api-keys');
+
+		expect(deleteApiKeyResponse.body.data.success).toBe(true);
+		expect(retrieveAllApiKeysResponse.body.data.length).toBe(0);
+	});
+});
+
+describe('Member', () => {
+	const memberPassword = randomValidPassword();
+	let member: User;
+
+	beforeEach(async () => {
+		member = await createUser({
+			password: memberPassword,
+			role: 'global:member',
+		});
+		await utils.setInstanceOwnerSetUp(true);
+	});
+
+	test('POST /api-keys should create an api key', async () => {
+		const newApiKeyResponse = await testServer.authAgentFor(member).post('/api-keys');
+
+		expect(newApiKeyResponse.statusCode).toBe(200);
+		expect(newApiKeyResponse.body.data.apiKey).toBeDefined();
+		expect(newApiKeyResponse.body.data.apiKey).not.toBeNull();
+
+		const newStoredApiKey = await Container.get(ApiKeyRepository).findOneByOrFail({
+			userId: member.id,
+		});
+
+		expect(newStoredApiKey).toEqual({
+			id: expect.any(String),
+			label: 'My API Key',
+			userId: member.id,
+			apiKey: newApiKeyResponse.body.data.apiKey,
+			createdAt: expect.any(Date),
+			updatedAt: expect.any(Date),
+		});
+	});
+
+	test('GET /api-keys should fetch the api key redacted', async () => {
+		const newApiKeyResponse = await testServer.authAgentFor(member).post('/api-keys');
+
+		const retrieveAllApiKeysResponse = await testServer.authAgentFor(member).get('/api-keys');
+
+		expect(retrieveAllApiKeysResponse.statusCode).toBe(200);
+
+		expect(retrieveAllApiKeysResponse.body.data[0]).toEqual({
+			id: newApiKeyResponse.body.data.id,
+			label: 'My API Key',
+			userId: member.id,
+			apiKey: publicApiKeyService.redactApiKey(newApiKeyResponse.body.data.apiKey),
+			createdAt: expect.any(String),
+			updatedAt: expect.any(String),
+		});
+
+		expect(newApiKeyResponse.body.data.apiKey).not.toEqual(
+			retrieveAllApiKeysResponse.body.data[0].apiKey,
+		);
+	});
+
+	test('DELETE /api-keys/:id should delete the api key', async () => {
+		const newApiKeyResponse = await testServer.authAgentFor(member).post('/api-keys');
+
+		const deleteApiKeyResponse = await testServer
+			.authAgentFor(member)
+			.delete(`/api-keys/${newApiKeyResponse.body.data.id}`);
+
+		const retrieveAllApiKeysResponse = await testServer.authAgentFor(member).get('/api-keys');
+
+		expect(deleteApiKeyResponse.body.data.success).toBe(true);
+		expect(retrieveAllApiKeysResponse.body.data.length).toBe(0);
+	});
+});
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
index 726c78537e..2326ed595a 100644
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -5,14 +5,17 @@ import { BinaryDataService } from 'n8n-core';
 import { Worker } from '@/commands/worker';
 import config from '@/config';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
-import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
+import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay';
 import { ExternalHooks } from '@/external-hooks';
 import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { Push } from '@/push';
+import { Publisher } from '@/scaling/pubsub/publisher.service';
+import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import { ScalingService } from '@/scaling/scaling.service';
-import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
 import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
+import { Telemetry } from '@/telemetry';
 import { setupTestCommand } from '@test-integration/utils/test-command';
 
 import { mockInstance } from '../../shared/mocking';
@@ -26,15 +29,17 @@ const externalSecretsManager = mockInstance(ExternalSecretsManager);
 const license = mockInstance(License, { loadCertStr: async () => '' });
 const messageEventBus = mockInstance(MessageEventBus);
 const logStreamingEventRelay = mockInstance(LogStreamingEventRelay);
-const orchestrationHandlerWorkerService = mockInstance(OrchestrationHandlerWorkerService);
 const scalingService = mockInstance(ScalingService);
 const orchestrationWorkerService = mockInstance(OrchestrationWorkerService);
+mockInstance(Publisher);
+mockInstance(Subscriber);
+mockInstance(Telemetry);
+mockInstance(Push);
 
 const command = setupTestCommand(Worker);
 
 test('worker initializes all its components', async () => {
 	const worker = await command.run();
-
 	expect(worker.queueModeId).toBeDefined();
 	expect(worker.queueModeId).toContain('worker');
 	expect(worker.queueModeId.length).toBeGreaterThan(15);
@@ -47,6 +52,5 @@ test('worker initializes all its components', async () => {
 	expect(scalingService.setupWorker).toHaveBeenCalledTimes(1);
 	expect(logStreamingEventRelay.init).toHaveBeenCalledTimes(1);
 	expect(orchestrationWorkerService.init).toHaveBeenCalledTimes(1);
-	expect(orchestrationHandlerWorkerService.initWithOptions).toHaveBeenCalledTimes(1);
 	expect(messageEventBus.send).toHaveBeenCalledTimes(1);
 });
diff --git a/packages/cli/test/integration/controllers/invitation/assertions.ts b/packages/cli/test/integration/controllers/invitation/assertions.ts
index 3e24a53222..daa40586f2 100644
--- a/packages/cli/test/integration/controllers/invitation/assertions.ts
+++ b/packages/cli/test/integration/controllers/invitation/assertions.ts
@@ -10,7 +10,6 @@ export function assertReturnedUserProps(user: User) {
 	expect(user.personalizationAnswers).toBeNull();
 	expect(user.password).toBeUndefined();
 	expect(user.isPending).toBe(false);
-	expect(user.apiKey).not.toBeDefined();
 	expect(user.globalScopes).toBeDefined();
 	expect(user.globalScopes).not.toHaveLength(0);
 }
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 b1c0bfab75..5428cafbd4 100644
--- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
@@ -3,6 +3,7 @@ import { Container } from 'typedi';
 
 import config from '@/config';
 import type { Project } from '@/databases/entities/project';
+import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
@@ -1118,18 +1119,6 @@ describe('PUT /:credentialId/transfer', () => {
 			.expect(400);
 	});
 
-	test('cannot transfer into a personal project', async () => {
-		const credential = await saveCredential(randomCredentialPayload(), {
-			user: member,
-		});
-
-		await testServer
-			.authAgentFor(member)
-			.put(`/credentials/${credential.id}/transfer`)
-			.send({ destinationProjectId: memberPersonalProject.id })
-			.expect(400);
-	});
-
 	test('cannot transfer somebody elses credential', async () => {
 		const destinationProject = await createTeamProject('Destination Project', member);
 
@@ -1158,187 +1147,139 @@ describe('PUT /:credentialId/transfer', () => {
 			.expect(404);
 	});
 
-	test('project:editors cannot transfer credentials', async () => {
-		//
-		// ARRANGE
-		//
-		const sourceProject = await createTeamProject('Source Project');
-		await linkUserToProject(member, sourceProject, 'project:editor');
-
-		const credential = await saveCredential(randomCredentialPayload(), {
-			project: sourceProject,
-		});
-
-		const destinationProject = await createTeamProject('Destination Project', member);
-
-		//
-		// ACT & ASSERT
-		//
-		await testServer
-			.authAgentFor(member)
-			.put(`/credentials/${credential.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(403);
-	});
-
-	test('transferring from a personal project to a team project severs all sharings', async () => {
-		//
-		// ARRANGE
-		//
-		const credential = await saveCredential(randomCredentialPayload(), { user: member });
-
-		// these sharings should be deleted by the transfer
-		await shareCredentialWithUsers(credential, [anotherMember, owner]);
-
-		const destinationProject = await createTeamProject('Destination Project', member);
-
-		//
-		// ACT
-		//
-		const response = await testServer
-			.authAgentFor(member)
-			.put(`/credentials/${credential.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(200);
-
-		//
-		// ASSERT
-		//
-		expect(response.body).toEqual({});
-
-		const allSharings = await getCredentialSharings(credential);
-		expect(allSharings).toHaveLength(1);
-		expect(allSharings[0]).toMatchObject({
-			projectId: destinationProject.id,
-			credentialsId: credential.id,
-			role: 'credential:owner',
-		});
-	});
-
-	test('can transfer from team to another team project', async () => {
-		//
-		// ARRANGE
-		//
-		const sourceProject = await createTeamProject('Team Project 1', member);
-		const credential = await saveCredential(randomCredentialPayload(), {
-			project: sourceProject,
-		});
-
-		const destinationProject = await createTeamProject('Team Project 2', member);
-
-		//
-		// ACT
-		//
-		const response = await testServer
-			.authAgentFor(member)
-			.put(`/credentials/${credential.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(200);
-
-		//
-		// ASSERT
-		//
-		expect(response.body).toEqual({});
-
-		const allSharings = await getCredentialSharings(credential);
-		expect(allSharings).toHaveLength(1);
-		expect(allSharings[0]).toMatchObject({
-			projectId: destinationProject.id,
-			credentialsId: credential.id,
-			role: 'credential:owner',
-		});
-	});
-
-	test.each([
-		['owners', () => owner],
-		['admins', () => admin],
-	])(
-		'%s can always transfer from any personal or team project into any team project',
-		async (_name, actor) => {
+	test.each<ProjectRole>(['project:editor', 'project:viewer'])(
+		'%ss cannot transfer credentials',
+		async (projectRole) => {
 			//
 			// ARRANGE
 			//
-			const sourceProject = await createTeamProject('Source Project', member);
-			const teamCredential = await saveCredential(randomCredentialPayload(), {
+			const sourceProject = await createTeamProject('Source Project');
+			await linkUserToProject(member, sourceProject, projectRole);
+
+			const credential = await saveCredential(randomCredentialPayload(), {
 				project: sourceProject,
 			});
 
-			const personalCredential = await saveCredential(randomCredentialPayload(), { user: member });
-
 			const destinationProject = await createTeamProject('Destination Project', member);
 
 			//
+			// ACT & ASSERT
+			//
+			await testServer
+				.authAgentFor(member)
+				.put(`/credentials/${credential.id}/transfer`)
+				.send({ destinationProjectId: destinationProject.id })
+				.expect(403);
+		},
+	);
+
+	test.each<
+		[
+			// user role
+			'owners' | 'admins',
+			// source project type
+			'team' | 'personal',
+			// destination project type
+			'team' | 'personal',
+			// actor
+			() => User,
+			// source project
+			() => Promise<Project> | Project,
+			// destination project
+			() => Promise<Project> | Project,
+		]
+	>([
+		// owner
+		[
+			'owners',
+			'team',
+			'team',
+			() => owner,
+			async () => await createTeamProject('Source Project'),
+			async () => await createTeamProject('Destination Project'),
+		],
+		[
+			'owners',
+			'team',
+			'personal',
+			() => owner,
+			async () => await createTeamProject('Source Project'),
+			() => memberPersonalProject,
+		],
+		[
+			'owners',
+			'personal',
+			'team',
+			() => owner,
+			() => memberPersonalProject,
+			async () => await createTeamProject('Destination Project'),
+		],
+
+		// admin
+		[
+			'admins',
+			'team',
+			'team',
+			() => admin,
+			async () => await createTeamProject('Source Project'),
+			async () => await createTeamProject('Destination Project'),
+		],
+		[
+			'admins',
+			'team',
+			'personal',
+			() => admin,
+			async () => await createTeamProject('Source Project'),
+			() => memberPersonalProject,
+		],
+		[
+			'admins',
+			'personal',
+			'team',
+			() => admin,
+			() => memberPersonalProject,
+			async () => await createTeamProject('Destination Project'),
+		],
+	])(
+		'%s can always transfer from a %s project to a %s project',
+		async (
+			_roleName,
+			_sourceProjectName,
+			_destinationProjectName,
+			getUser,
+			getSourceProject,
+			getDestinationProject,
+		) => {
+			// ARRANGE
+			const user = getUser();
+			const sourceProject = await getSourceProject();
+			const destinationProject = await getDestinationProject();
+
+			const credential = await saveCredential(randomCredentialPayload(), {
+				project: sourceProject,
+			});
+
 			// ACT
-			//
-			const response1 = await testServer
-				.authAgentFor(actor())
-				.put(`/credentials/${teamCredential.id}/transfer`)
-				.send({ destinationProjectId: destinationProject.id })
-				.expect(200);
-			const response2 = await testServer
-				.authAgentFor(actor())
-				.put(`/credentials/${personalCredential.id}/transfer`)
+			const response = await testServer
+				.authAgentFor(user)
+				.put(`/credentials/${credential.id}/transfer`)
 				.send({ destinationProjectId: destinationProject.id })
 				.expect(200);
 
-			//
 			// ASSERT
-			//
-			expect(response1.body).toEqual({});
-			expect(response2.body).toEqual({});
+			expect(response.body).toEqual({});
 
 			{
-				const allSharings = await getCredentialSharings(teamCredential);
+				const allSharings = await getCredentialSharings(credential);
 				expect(allSharings).toHaveLength(1);
 				expect(allSharings[0]).toMatchObject({
 					projectId: destinationProject.id,
-					credentialsId: teamCredential.id,
-					role: 'credential:owner',
-				});
-			}
-
-			{
-				const allSharings = await getCredentialSharings(personalCredential);
-				expect(allSharings).toHaveLength(1);
-				expect(allSharings[0]).toMatchObject({
-					projectId: destinationProject.id,
-					credentialsId: personalCredential.id,
+					credentialsId: credential.id,
 					role: 'credential:owner',
 				});
 			}
 		},
 	);
-
-	test.each([
-		['owners', () => owner],
-		['admins', () => admin],
-	])('%s cannot transfer into personal projects', async (_name, actor) => {
-		//
-		// ARRANGE
-		//
-		const sourceProject = await createTeamProject('Source Project', member);
-		const teamCredential = await saveCredential(randomCredentialPayload(), {
-			project: sourceProject,
-		});
-
-		const personalCredential = await saveCredential(randomCredentialPayload(), { user: member });
-
-		const destinationProject = anotherMemberPersonalProject;
-
-		//
-		// ACT & ASSERT
-		//
-		await testServer
-			.authAgentFor(actor())
-			.put(`/credentials/${teamCredential.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(400);
-		await testServer
-			.authAgentFor(actor())
-			.put(`/credentials/${personalCredential.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(400);
-	});
 });
 
 function validateMainCredentialData(credential: ListQuery.Credentials.WithOwnedByAndSharedWith) {
diff --git a/packages/cli/test/integration/deduplication/deduplication-helper.test.ts b/packages/cli/test/integration/deduplication/deduplication-helper.test.ts
new file mode 100644
index 0000000000..2859bb363c
--- /dev/null
+++ b/packages/cli/test/integration/deduplication/deduplication-helper.test.ts
@@ -0,0 +1,532 @@
+import { DataDeduplicationService } from 'n8n-core';
+import type { ICheckProcessedContextData, INodeTypeData } from 'n8n-workflow';
+import type { IDeduplicationOutput, INode, DeduplicationItemTypes } from 'n8n-workflow';
+import { Workflow } from 'n8n-workflow';
+
+import { getDataDeduplicationService } from '@/deduplication';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { NodeTypes } from '@/node-types';
+import { mockInstance } from '@test/mocking';
+import { createWorkflow } from '@test-integration/db/workflows';
+
+import * as testDb from '../shared/test-db';
+
+let workflow: Workflow;
+
+jest.mock('../../../src/telemetry');
+
+const MOCK_NODE_TYPES_DATA = mockNodeTypesData(['set']);
+mockInstance(LoadNodesAndCredentials, {
+	loaded: {
+		nodes: MOCK_NODE_TYPES_DATA,
+		credentials: {},
+	},
+});
+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 node: INode = {
+	id: 'uuid-1234',
+	parameters: {},
+	name: 'test',
+	type: 'test.set',
+	typeVersion: 1,
+	position: [0, 0],
+};
+
+beforeAll(async () => {
+	await testDb.init();
+
+	const nodeTypes = mockInstance(NodeTypes);
+	const workflowEntityOriginal = await createWorkflow();
+
+	workflow = new Workflow({
+		id: workflowEntityOriginal.id,
+		nodes: [node],
+		connections: {},
+		active: false,
+		nodeTypes,
+	});
+
+	const dataDeduplicationService = getDataDeduplicationService();
+	await DataDeduplicationService.init(dataDeduplicationService);
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['ProcessedData']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+describe('Deduplication.DeduplicationHelper', () => {
+	test('Deduplication (mode: entries): DeduplicationHelper should record and check data correctly', async () => {
+		const context = 'node';
+		const contextData: ICheckProcessedContextData = {
+			workflow,
+			node,
+		};
+
+		let processedData: IDeduplicationOutput;
+
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b'],
+			context,
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		// 'a' & 'b' got only checked before, so still has to be new
+		expect(processedData).toEqual({ new: ['a', 'b'], processed: [] });
+
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c', 'd'],
+			context,
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		// 'a' & 'b' got recorded before, 'c' only checked bfeore and 'd' has never been seen
+		expect(processedData).toEqual({ new: ['c', 'd'], processed: ['a', 'b'] });
+
+		await DataDeduplicationService.getInstance().removeProcessed(['b', 'd'], context, contextData, {
+			mode: 'entries',
+		});
+	});
+
+	test('Deduplication (mode: entries): DeduplicationHelper different contexts should not interfere with each other', async () => {
+		const contextData: ICheckProcessedContextData = {
+			workflow,
+			node,
+		};
+
+		let processedData: IDeduplicationOutput;
+
+		// Add data with context "node"
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b'],
+			'node',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		// No data exists yet for context "node" so has to be new
+		expect(processedData).toEqual({ new: ['a', 'b'], processed: [] });
+
+		// Add data with context "workflow"
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'workflow',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		// No data exists yet for context 'worklow' so has to be new
+		expect(processedData).toEqual({ new: ['a', 'b', 'c'], processed: [] });
+
+		await DataDeduplicationService.getInstance().removeProcessed(['a'], 'node', contextData, {
+			mode: 'entries',
+		});
+
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'node',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		// 'a' got removed for the context 'node' and 'c' never got saved, so only 'b' should be known
+		expect(processedData).toEqual({ new: ['a', 'c'], processed: ['b'] });
+
+		await DataDeduplicationService.getInstance().removeProcessed(['b'], 'workflow', contextData, {
+			mode: 'entries',
+		});
+
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c', 'd'],
+			'workflow',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		// 'b' got removed for the context 'workflow' and 'd' never got saved for that reason new
+		// 'a' and 'c' should should be known
+		expect(processedData).toEqual({ new: ['b', 'd'], processed: ['a', 'c'] });
+	});
+
+	test('Deduplication (mode: entries): DeduplicationHelper check maxEntries', async () => {
+		const contextData: ICheckProcessedContextData = {
+			workflow,
+			node,
+		};
+
+		let processedData: IDeduplicationOutput;
+
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['0', '1', '2', '3'],
+			'node',
+			contextData,
+			{ mode: 'entries', maxEntries: 5 },
+		);
+
+		// All data should be new
+		expect(processedData).toEqual({ new: ['0', '1', '2', '3'], processed: [] });
+
+		// Add data with context "workflow"
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['4', '5', '6'],
+			'node',
+			contextData,
+			{ mode: 'entries', maxEntries: 5 },
+		);
+
+		// All given data should be new
+		expect(processedData).toEqual({ new: ['4', '5', '6'], processed: [] });
+
+		// This should not make a difference, removing an item which does not exist
+		await DataDeduplicationService.getInstance().removeProcessed(['a'], 'node', contextData, {
+			mode: 'entries',
+		});
+
+		processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['0', '1', '2', '3', '4', '5', '6', '7'],
+			'node',
+			contextData,
+			{ mode: 'entries', maxEntries: 5 },
+		);
+
+		// '7' should be new and '0' and '1' also because they got been pruned as max 5 get saved
+		expect(processedData).toEqual({ new: ['0', '1', '7'], processed: ['2', '3', '4', '5', '6'] });
+	});
+
+	describe('Deduplication (mode: latestIncrementalKey): DeduplicationHelper should record and check data correctly', () => {
+		const tests: Array<{
+			description: string;
+			data: Array<{
+				operation: 'checkProcessedAndRecord';
+				input: DeduplicationItemTypes[];
+				output: IDeduplicationOutput;
+			}>;
+		}> = [
+			{
+				description: 'dates',
+				data: [
+					{
+						operation: 'checkProcessedAndRecord',
+						input: [new Date('2022-01-02').toISOString(), new Date('2022-01-03').toISOString()],
+						output: {
+							new: [new Date('2022-01-02').toISOString(), new Date('2022-01-03').toISOString()],
+							processed: [],
+						},
+					},
+					{
+						operation: 'checkProcessedAndRecord',
+						input: [
+							new Date('2022-01-02').toISOString(),
+							new Date('2022-01-03').toISOString(),
+							new Date('2022-01-04').toISOString(),
+							new Date('2022-01-05').toISOString(),
+						],
+						output: {
+							new: [new Date('2022-01-04').toISOString(), new Date('2022-01-05').toISOString()],
+							processed: [
+								new Date('2022-01-02').toISOString(),
+								new Date('2022-01-03').toISOString(),
+							],
+						},
+					},
+				],
+			},
+			{
+				description: 'numbers',
+				data: [
+					{
+						operation: 'checkProcessedAndRecord',
+						input: [2, 3],
+						output: { new: [2, 3], processed: [] },
+					},
+					{
+						operation: 'checkProcessedAndRecord',
+						input: [2, 3, 4, 5],
+						output: { new: [4, 5], processed: [2, 3] },
+					},
+				],
+			},
+		];
+
+		for (const testData of tests) {
+			test(testData.description, async () => {
+				const context = 'node';
+				const contextData: ICheckProcessedContextData = {
+					workflow,
+					node,
+				};
+				const mode = testData.description === 'dates' ? 'latestDate' : 'latestIncrementalKey';
+
+				let processedData: IDeduplicationOutput;
+
+				for (const data of testData.data) {
+					processedData = await DataDeduplicationService.getInstance()[data.operation](
+						data.input,
+						context,
+						contextData,
+						{ mode },
+					);
+
+					expect(processedData).toEqual(data.output);
+				}
+			});
+		}
+	});
+
+	test('removeProcessed should throw error for latest modes', async () => {
+		const contextData: ICheckProcessedContextData = {
+			workflow,
+			node,
+		};
+
+		await expect(
+			DataDeduplicationService.getInstance().removeProcessed(['2022-01-01'], 'node', contextData, {
+				mode: 'latestDate',
+			}),
+		).rejects.toThrow('Removing processed data is not possible in mode "latest"');
+
+		await expect(
+			DataDeduplicationService.getInstance().removeProcessed([1], 'node', contextData, {
+				mode: 'latestIncrementalKey',
+			}),
+		).rejects.toThrow('Removing processed data is not possible in mode "latest"');
+	});
+
+	test('clearAllProcessedItems should delete all processed items for workflow scope', async () => {
+		const contextData: ICheckProcessedContextData = {
+			workflow,
+		};
+
+		// First, add some data
+		await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'workflow',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		// Clear all processed items
+		await DataDeduplicationService.getInstance().clearAllProcessedItems('workflow', contextData, {
+			mode: 'entries',
+		});
+
+		// Check that all items are now considered new
+		const processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'workflow',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		expect(processedData).toEqual({ new: ['a', 'b', 'c'], processed: [] });
+	});
+
+	test('clearAllProcessedItems should delete all processed items for node scope', async () => {
+		const contextData: ICheckProcessedContextData = {
+			workflow,
+			node,
+		};
+
+		// First, add some data
+		await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'node',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		// Clear all processed items
+		await DataDeduplicationService.getInstance().clearAllProcessedItems('node', contextData, {
+			mode: 'entries',
+		});
+
+		// Check that all items are now considered new
+		const processedData = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'node',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		expect(processedData).toEqual({ new: ['a', 'b', 'c'], processed: [] });
+	});
+
+	test('clearAllProcessedItems should not clear workflow processed items when clearing node scope', async () => {
+		const contextDataWorkflow: ICheckProcessedContextData = {
+			workflow,
+		};
+
+		const contextDataNode: ICheckProcessedContextData = {
+			workflow,
+			node,
+		};
+
+		// Add data for workflow scope
+		await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'workflow',
+			contextDataWorkflow,
+			{ mode: 'entries' },
+		);
+
+		// Add data for node scope
+		await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['d', 'e', 'f'],
+			'node',
+			contextDataNode,
+			{ mode: 'entries' },
+		);
+
+		// Clear all processed items for node scope
+		await DataDeduplicationService.getInstance().clearAllProcessedItems('node', contextDataNode, {
+			mode: 'entries',
+		});
+
+		// Ensure workflow processed items are still intact
+		const processedDataWorkflow =
+			await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+				['a', 'b', 'c'],
+				'workflow',
+				contextDataWorkflow,
+				{ mode: 'entries' },
+			);
+
+		// Workflow items should still be considered processed
+		expect(processedDataWorkflow).toEqual({ new: [], processed: ['a', 'b', 'c'] });
+
+		// Ensure node processed items have been cleared
+		const processedDataNode = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['d', 'e', 'f'],
+			'node',
+			contextDataNode,
+			{ mode: 'entries' },
+		);
+
+		// Node items should be considered new
+		expect(processedDataNode).toEqual({ new: ['d', 'e', 'f'], processed: [] });
+	});
+
+	test('clearAllProcessedItems should not clear node processed items when clearing workflow scope', async () => {
+		const contextDataWorkflow: ICheckProcessedContextData = {
+			workflow,
+		};
+
+		const contextDataNode: ICheckProcessedContextData = {
+			workflow,
+			node,
+		};
+
+		// Add data for workflow scope
+		await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'workflow',
+			contextDataWorkflow,
+			{ mode: 'entries' },
+		);
+
+		// Add data for node scope
+		await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['d', 'e', 'f'],
+			'node',
+			contextDataNode,
+			{ mode: 'entries' },
+		);
+
+		// Clear all processed items for workflow scope
+		await DataDeduplicationService.getInstance().clearAllProcessedItems(
+			'workflow',
+			contextDataWorkflow,
+			{
+				mode: 'entries',
+			},
+		);
+
+		// Ensure node processed items are still intact
+		const processedDataNode = await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['d', 'e', 'f'],
+			'node',
+			contextDataNode,
+			{ mode: 'entries' },
+		);
+
+		// Node items should still be considered processed
+		expect(processedDataNode).toEqual({ new: [], processed: ['d', 'e', 'f'] });
+
+		// Ensure workflow processed items have been cleared
+		const processedDataWorkflow =
+			await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+				['a', 'b', 'c'],
+				'workflow',
+				contextDataWorkflow,
+				{ mode: 'entries' },
+			);
+
+		// Workflow items should be considered new
+		expect(processedDataWorkflow).toEqual({ new: ['a', 'b', 'c'], processed: [] });
+	});
+
+	test('getProcessedDataCount should return correct count for different modes', async () => {
+		const contextData: ICheckProcessedContextData = {
+			workflow,
+			node,
+		};
+
+		// Test for 'entries' mode
+		await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+			['a', 'b', 'c'],
+			'node',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		const entriesCount = await DataDeduplicationService.getInstance().getProcessedDataCount(
+			'node',
+			contextData,
+			{ mode: 'entries' },
+		);
+
+		expect(entriesCount).toBe(3);
+
+		// Test for other modes (should return 0)
+		const latestCount = await DataDeduplicationService.getInstance().getProcessedDataCount(
+			'node',
+			contextData,
+			{ mode: 'latestDate' },
+		);
+
+		expect(latestCount).toBe(0);
+	});
+});
diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts
index 05061e536e..22d0d65754 100644
--- a/packages/cli/test/integration/execution.service.integration.test.ts
+++ b/packages/cli/test/integration/execution.service.integration.test.ts
@@ -6,6 +6,7 @@ import { ExecutionRepository } from '@/databases/repositories/execution.reposito
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { ExecutionService } from '@/executions/execution.service';
 import type { ExecutionSummaries } from '@/executions/execution.types';
+import { createTeamProject } from '@test-integration/db/projects';
 
 import { annotateExecution, createAnnotationTags, createExecution } from './shared/db/executions';
 import { createWorkflow } from './shared/db/workflows';
@@ -69,6 +70,7 @@ describe('ExecutionService', () => {
 				mode: expect.any(String),
 				retryOf: null,
 				status: expect.any(String),
+				createdAt: expect.any(String),
 				startedAt: expect.any(String),
 				stoppedAt: expect.any(String),
 				waitTill: null,
@@ -294,6 +296,37 @@ describe('ExecutionService', () => {
 			});
 		});
 
+		test('should filter executions by `projectId`', async () => {
+			const firstProject = await createTeamProject();
+			const secondProject = await createTeamProject();
+
+			const firstWorkflow = await createWorkflow(undefined, firstProject);
+			const secondWorkflow = await createWorkflow(undefined, secondProject);
+
+			await createExecution({ status: 'success' }, firstWorkflow);
+			await createExecution({ status: 'success' }, firstWorkflow);
+			await createExecution({ status: 'success' }, secondWorkflow); // to filter out
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				accessibleWorkflowIds: [firstWorkflow.id],
+				projectId: firstProject.id,
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output).toEqual({
+				count: 2,
+				estimated: false,
+				results: expect.arrayContaining([
+					expect.objectContaining({ workflowId: firstWorkflow.id }),
+					expect.objectContaining({ workflowId: firstWorkflow.id }),
+					// execution for workflow in second project was filtered out
+				]),
+			});
+		});
+
 		test('should exclude executions by inaccessible `workflowId`', async () => {
 			const accessibleWorkflow = await createWorkflow();
 			const inaccessibleWorkflow = await createWorkflow();
@@ -478,6 +511,7 @@ describe('ExecutionService', () => {
 			mode: expect.any(String),
 			retryOf: null,
 			status: expect.any(String),
+			createdAt: expect.any(String),
 			startedAt: expect.any(String),
 			stoppedAt: expect.any(String),
 			waitTill: null,
diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts
index df9b7c48b6..a29f158a32 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -1,5 +1,4 @@
 import { GlobalConfig } from '@n8n/config';
-import { IsNull } from '@n8n/typeorm';
 import type { IPersonalizationSurveyAnswersV4 } from 'n8n-workflow';
 import { Container } from 'typedi';
 import validator from 'validator';
@@ -10,8 +9,8 @@ import { UserRepository } from '@/databases/repositories/user.repository';
 import { mockInstance } from '@test/mocking';
 
 import { SUCCESS_RESPONSE_BODY } from './shared/constants';
-import { addApiKey, createOwner, createUser, createUserShell } from './shared/db/users';
-import { randomApiKey, randomEmail, randomName, randomValidPassword } from './shared/random';
+import { createUser, createUserShell } from './shared/db/users';
+import { randomEmail, randomName, randomValidPassword } from './shared/random';
 import * as testDb from './shared/test-db';
 import type { SuperAgentTest } from './shared/types';
 import * as utils from './shared/utils/';
@@ -23,37 +22,12 @@ beforeEach(async () => {
 	mockInstance(GlobalConfig, { publicApi: { disabled: false } });
 });
 
-describe('When public API is disabled', () => {
-	let owner: User;
-	let authAgent: SuperAgentTest;
-
-	beforeEach(async () => {
-		owner = await createOwner();
-		await addApiKey(owner);
-		authAgent = testServer.authAgentFor(owner);
-		mockInstance(GlobalConfig, { publicApi: { disabled: true } });
-	});
-
-	test('POST /me/api-key should 404', async () => {
-		await authAgent.post('/me/api-key').expect(404);
-	});
-
-	test('GET /me/api-key should 404', async () => {
-		await authAgent.get('/me/api-key').expect(404);
-	});
-
-	test('DELETE /me/api-key should 404', async () => {
-		await authAgent.delete('/me/api-key').expect(404);
-	});
-});
-
 describe('Owner shell', () => {
 	let ownerShell: User;
 	let authOwnerShellAgent: SuperAgentTest;
 
 	beforeEach(async () => {
 		ownerShell = await createUserShell('global:owner');
-		await addApiKey(ownerShell);
 		authOwnerShellAgent = testServer.authAgentFor(ownerShell);
 	});
 
@@ -63,17 +37,8 @@ describe('Owner shell', () => {
 
 			expect(response.statusCode).toBe(200);
 
-			const {
-				id,
-				email,
-				firstName,
-				lastName,
-				personalizationAnswers,
-				role,
-				password,
-				isPending,
-				apiKey,
-			} = response.body.data;
+			const { id, email, firstName, lastName, personalizationAnswers, role, password, isPending } =
+				response.body.data;
 
 			expect(validator.isUUID(id)).toBe(true);
 			expect(email).toBe(validPayload.email.toLowerCase());
@@ -83,7 +48,6 @@ describe('Owner shell', () => {
 			expect(password).toBeUndefined();
 			expect(isPending).toBe(false);
 			expect(role).toBe('global:owner');
-			expect(apiKey).toBeUndefined();
 
 			const storedOwnerShell = await Container.get(UserRepository).findOneByOrFail({ id });
 
@@ -160,39 +124,6 @@ describe('Owner shell', () => {
 			expect(storedShellOwner.personalizationAnswers).toEqual(validPayload);
 		}
 	});
-
-	test('POST /me/api-key should create an api key', async () => {
-		const response = await authOwnerShellAgent.post('/me/api-key');
-
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.apiKey).toBeDefined();
-		expect(response.body.data.apiKey).not.toBeNull();
-
-		const storedShellOwner = await Container.get(UserRepository).findOneOrFail({
-			where: { email: IsNull() },
-		});
-
-		expect(storedShellOwner.apiKey).toEqual(response.body.data.apiKey);
-	});
-
-	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).not.toEqual(ownerShell.apiKey);
-	});
-
-	test('DELETE /me/api-key should delete the api key', async () => {
-		const response = await authOwnerShellAgent.delete('/me/api-key');
-
-		expect(response.statusCode).toBe(200);
-
-		const storedShellOwner = await Container.get(UserRepository).findOneOrFail({
-			where: { email: IsNull() },
-		});
-
-		expect(storedShellOwner.apiKey).toBeNull();
-	});
 });
 
 describe('Member', () => {
@@ -204,10 +135,8 @@ describe('Member', () => {
 		member = await createUser({
 			password: memberPassword,
 			role: 'global:member',
-			apiKey: randomApiKey(),
 		});
 		authMemberAgent = testServer.authAgentFor(member);
-
 		await utils.setInstanceOwnerSetUp(true);
 	});
 
@@ -215,17 +144,8 @@ describe('Member', () => {
 		for (const validPayload of VALID_PATCH_ME_PAYLOADS) {
 			const response = await authMemberAgent.patch('/me').send(validPayload).expect(200);
 
-			const {
-				id,
-				email,
-				firstName,
-				lastName,
-				personalizationAnswers,
-				role,
-				password,
-				isPending,
-				apiKey,
-			} = response.body.data;
+			const { id, email, firstName, lastName, personalizationAnswers, role, password, isPending } =
+				response.body.data;
 
 			expect(validator.isUUID(id)).toBe(true);
 			expect(email).toBe(validPayload.email.toLowerCase());
@@ -235,7 +155,6 @@ describe('Member', () => {
 			expect(password).toBeUndefined();
 			expect(isPending).toBe(false);
 			expect(role).toBe('global:member');
-			expect(apiKey).toBeUndefined();
 
 			const storedMember = await Container.get(UserRepository).findOneByOrFail({ id });
 
@@ -275,6 +194,7 @@ describe('Member', () => {
 		};
 
 		const response = await authMemberAgent.patch('/me/password').send(validPayload);
+
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
 
@@ -314,35 +234,6 @@ describe('Member', () => {
 			expect(storedAnswers).toEqual(validPayload);
 		}
 	});
-
-	test('POST /me/api-key should create an api key', async () => {
-		const response = await testServer.authAgentFor(member).post('/me/api-key');
-
-		expect(response.statusCode).toBe(200);
-		expect(response.body.data.apiKey).toBeDefined();
-		expect(response.body.data.apiKey).not.toBeNull();
-
-		const storedMember = await Container.get(UserRepository).findOneByOrFail({ id: member.id });
-
-		expect(storedMember.apiKey).toEqual(response.body.data.apiKey);
-	});
-
-	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).not.toEqual(member.apiKey);
-	});
-
-	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);
-
-		const storedMember = await Container.get(UserRepository).findOneByOrFail({ id: member.id });
-
-		expect(storedMember.apiKey).toBeNull();
-	});
 });
 
 describe('Owner', () => {
diff --git a/packages/cli/test/integration/pruning.service.test.ts b/packages/cli/test/integration/pruning.service.test.ts
index 990d0aec3a..c4d1957de0 100644
--- a/packages/cli/test/integration/pruning.service.test.ts
+++ b/packages/cli/test/integration/pruning.service.test.ts
@@ -8,7 +8,7 @@ import { TIME } from '@/constants';
 import type { ExecutionEntity } from '@/databases/entities/execution-entity';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { PruningService } from '@/services/pruning.service';
 
 import {
diff --git a/packages/cli/test/integration/public-api/credentials.test.ts b/packages/cli/test/integration/public-api/credentials.test.ts
index 7323de391e..5574d4f3bf 100644
--- a/packages/cli/test/integration/public-api/credentials.test.ts
+++ b/packages/cli/test/integration/public-api/credentials.test.ts
@@ -7,8 +7,8 @@ import { SharedCredentialsRepository } from '@/databases/repositories/shared-cre
 import { createTeamProject } from '@test-integration/db/projects';
 
 import { affixRoleToSaveCredential, createCredentials } from '../shared/db/credentials';
-import { addApiKey, createUser, createUserShell } from '../shared/db/users';
-import { randomApiKey, randomName } from '../shared/random';
+import { createMemberWithApiKey, createOwnerWithApiKey } from '../shared/db/users';
+import { randomName } from '../shared/random';
 import * as testDb from '../shared/test-db';
 import type { CredentialPayload, SaveCredentialFunction } from '../shared/types';
 import type { SuperAgentTest } from '../shared/types';
@@ -24,8 +24,8 @@ let saveCredential: SaveCredentialFunction;
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 
 beforeAll(async () => {
-	owner = await addApiKey(await createUserShell('global:owner'));
-	member = await createUser({ role: 'global:member', apiKey: randomApiKey() });
+	owner = await createOwnerWithApiKey();
+	member = await createMemberWithApiKey();
 
 	authOwnerAgent = testServer.publicApiAgentFor(owner);
 	authMemberAgent = testServer.publicApiAgentFor(member);
@@ -156,10 +156,7 @@ describe('DELETE /credentials/:id', () => {
 	});
 
 	test('should delete owned cred for member but leave others untouched', async () => {
-		const anotherMember = await createUser({
-			role: 'global:member',
-			apiKey: randomApiKey(),
-		});
+		const anotherMember = await createMemberWithApiKey();
 
 		const savedCredential = await saveCredential(dbCredential(), { user: member });
 		const notToBeChangedCredential = await saveCredential(dbCredential(), { user: member });
diff --git a/packages/cli/test/integration/public-api/executions.test.ts b/packages/cli/test/integration/public-api/executions.test.ts
index 019f69adc5..13324ed55c 100644
--- a/packages/cli/test/integration/public-api/executions.test.ts
+++ b/packages/cli/test/integration/public-api/executions.test.ts
@@ -12,13 +12,12 @@ import {
 	createSuccessfulExecution,
 	createWaitingExecution,
 } from '../shared/db/executions';
-import { createUser } from '../shared/db/users';
+import { createMemberWithApiKey, createOwnerWithApiKey } from '../shared/db/users';
 import {
 	createManyWorkflows,
 	createWorkflow,
 	shareWorkflowWithUsers,
 } from '../shared/db/workflows';
-import { randomApiKey } from '../shared/random';
 import * as testDb from '../shared/test-db';
 import type { SuperAgentTest } from '../shared/types';
 import * as utils from '../shared/utils/';
@@ -36,9 +35,9 @@ mockInstance(Telemetry);
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 
 beforeAll(async () => {
-	owner = await createUser({ role: 'global:owner', apiKey: randomApiKey() });
-	user1 = await createUser({ role: 'global:member', apiKey: randomApiKey() });
-	user2 = await createUser({ role: 'global:member', apiKey: randomApiKey() });
+	owner = await createOwnerWithApiKey();
+	user1 = await createMemberWithApiKey();
+	user2 = await createMemberWithApiKey();
 
 	// TODO: mock BinaryDataService instead
 	await utils.initBinaryDataService();
diff --git a/packages/cli/test/integration/public-api/projects.test.ts b/packages/cli/test/integration/public-api/projects.test.ts
index 2bc8e9346b..f815d9d07b 100644
--- a/packages/cli/test/integration/public-api/projects.test.ts
+++ b/packages/cli/test/integration/public-api/projects.test.ts
@@ -2,7 +2,7 @@ import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import { Telemetry } from '@/telemetry';
 import { mockInstance } from '@test/mocking';
 import { createTeamProject, getProjectByNameOrFail } from '@test-integration/db/projects';
-import { createMember, createOwner } from '@test-integration/db/users';
+import { createMemberWithApiKey, createOwnerWithApiKey } from '@test-integration/db/users';
 import { setupTestServer } from '@test-integration/utils';
 
 import * as testDb from '../shared/test-db';
@@ -26,7 +26,7 @@ describe('Projects in Public API', () => {
 			 */
 			testServer.license.setQuota('quota:maxTeamProjects', -1);
 			testServer.license.enable('feat:projectRole:admin');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const projects = await Promise.all([
 				createTeamProject(),
 				createTeamProject(),
@@ -53,15 +53,10 @@ describe('Projects in Public API', () => {
 		});
 
 		it('if not authenticated, should reject', async () => {
-			/**
-			 * Arrange
-			 */
-			const owner = await createOwner({ withApiKey: false });
-
 			/**
 			 * Act
 			 */
-			const response = await testServer.publicApiAgentFor(owner).get('/projects');
+			const response = await testServer.publicApiAgentWithoutApiKey().get('/projects');
 
 			/**
 			 * Assert
@@ -74,7 +69,7 @@ describe('Projects in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 
 			/**
 			 * Act
@@ -97,12 +92,12 @@ describe('Projects in Public API', () => {
 			 */
 			testServer.license.setQuota('quota:maxTeamProjects', -1);
 			testServer.license.enable('feat:projectRole:admin');
-			const owner = await createMember({ withApiKey: true });
+			const member = await createMemberWithApiKey();
 
 			/**
 			 * Act
 			 */
-			const response = await testServer.publicApiAgentFor(owner).get('/projects');
+			const response = await testServer.publicApiAgentFor(member).get('/projects');
 
 			/**
 			 * Assert
@@ -119,7 +114,7 @@ describe('Projects in Public API', () => {
 			 */
 			testServer.license.setQuota('quota:maxTeamProjects', -1);
 			testServer.license.enable('feat:projectRole:admin');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const projectPayload = { name: 'some-project' };
 
 			/**
@@ -150,14 +145,13 @@ describe('Projects in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: false });
 			const projectPayload = { name: 'some-project' };
 
 			/**
 			 * Act
 			 */
 			const response = await testServer
-				.publicApiAgentFor(owner)
+				.publicApiAgentWithoutApiKey()
 				.post('/projects')
 				.send(projectPayload);
 
@@ -172,7 +166,7 @@ describe('Projects in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const projectPayload = { name: 'some-project' };
 
 			/**
@@ -199,7 +193,7 @@ describe('Projects in Public API', () => {
 			 */
 			testServer.license.setQuota('quota:maxTeamProjects', -1);
 			testServer.license.enable('feat:projectRole:admin');
-			const member = await createMember({ withApiKey: true });
+			const member = await createMemberWithApiKey();
 			const projectPayload = { name: 'some-project' };
 
 			/**
@@ -225,7 +219,7 @@ describe('Projects in Public API', () => {
 			 */
 			testServer.license.setQuota('quota:maxTeamProjects', -1);
 			testServer.license.enable('feat:projectRole:admin');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const project = await createTeamProject();
 
 			/**
@@ -244,13 +238,14 @@ describe('Projects in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: false });
 			const project = await createTeamProject();
 
 			/**
 			 * Act
 			 */
-			const response = await testServer.publicApiAgentFor(owner).delete(`/projects/${project.id}`);
+			const response = await testServer
+				.publicApiAgentWithoutApiKey()
+				.delete(`/projects/${project.id}`);
 
 			/**
 			 * Assert
@@ -263,7 +258,7 @@ describe('Projects in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const project = await createTeamProject();
 
 			/**
@@ -287,13 +282,13 @@ describe('Projects in Public API', () => {
 			 */
 			testServer.license.setQuota('quota:maxTeamProjects', -1);
 			testServer.license.enable('feat:projectRole:admin');
-			const member = await createMember({ withApiKey: true });
+			const owner = await createMemberWithApiKey();
 			const project = await createTeamProject();
 
 			/**
 			 * Act
 			 */
-			const response = await testServer.publicApiAgentFor(member).delete(`/projects/${project.id}`);
+			const response = await testServer.publicApiAgentFor(owner).delete(`/projects/${project.id}`);
 
 			/**
 			 * Assert
@@ -310,7 +305,7 @@ describe('Projects in Public API', () => {
 			 */
 			testServer.license.setQuota('quota:maxTeamProjects', -1);
 			testServer.license.enable('feat:projectRole:admin');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const project = await createTeamProject('old-name');
 
 			/**
@@ -332,14 +327,13 @@ describe('Projects in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: false });
 			const project = await createTeamProject();
 
 			/**
 			 * Act
 			 */
 			const response = await testServer
-				.publicApiAgentFor(owner)
+				.publicApiAgentWithoutApiKey()
 				.put(`/projects/${project.id}`)
 				.send({ name: 'new-name' });
 
@@ -354,7 +348,7 @@ describe('Projects in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const project = await createTeamProject();
 
 			/**
@@ -381,7 +375,7 @@ describe('Projects in Public API', () => {
 			 */
 			testServer.license.setQuota('quota:maxTeamProjects', -1);
 			testServer.license.enable('feat:projectRole:admin');
-			const member = await createMember({ withApiKey: true });
+			const member = await createMemberWithApiKey();
 			const project = await createTeamProject();
 
 			/**
diff --git a/packages/cli/test/integration/public-api/tags.test.ts b/packages/cli/test/integration/public-api/tags.test.ts
index 776d79d368..c2e25cc3f6 100644
--- a/packages/cli/test/integration/public-api/tags.test.ts
+++ b/packages/cli/test/integration/public-api/tags.test.ts
@@ -4,8 +4,7 @@ import type { User } from '@/databases/entities/user';
 import { TagRepository } from '@/databases/repositories/tag.repository';
 
 import { createTag } from '../shared/db/tags';
-import { createUser } from '../shared/db/users';
-import { randomApiKey } from '../shared/random';
+import { createMemberWithApiKey, createOwnerWithApiKey } from '../shared/db/users';
 import * as testDb from '../shared/test-db';
 import type { SuperAgentTest } from '../shared/types';
 import * as utils from '../shared/utils/';
@@ -18,15 +17,8 @@ let authMemberAgent: SuperAgentTest;
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 
 beforeAll(async () => {
-	owner = await createUser({
-		role: 'global:owner',
-		apiKey: randomApiKey(),
-	});
-
-	member = await createUser({
-		role: 'global:member',
-		apiKey: randomApiKey(),
-	});
+	owner = await createOwnerWithApiKey();
+	member = await createMemberWithApiKey();
 });
 
 beforeEach(async () => {
diff --git a/packages/cli/test/integration/public-api/users.ee.test.ts b/packages/cli/test/integration/public-api/users.ee.test.ts
index 04649403d9..08161a41d8 100644
--- a/packages/cli/test/integration/public-api/users.ee.test.ts
+++ b/packages/cli/test/integration/public-api/users.ee.test.ts
@@ -6,8 +6,13 @@ import { License } from '@/license';
 import { createTeamProject, linkUserToProject } from '@test-integration/db/projects';
 
 import { mockInstance } from '../../shared/mocking';
-import { createOwner, createUser, createUserShell } from '../shared/db/users';
-import { randomApiKey } from '../shared/random';
+import {
+	createMember,
+	createMemberWithApiKey,
+	createOwnerWithApiKey,
+	createUser,
+	createUserShell,
+} from '../shared/db/users';
 import * as testDb from '../shared/test-db';
 import type { SuperAgentTest } from '../shared/types';
 import * as utils from '../shared/utils/';
@@ -25,32 +30,23 @@ beforeEach(async () => {
 describe('With license unlimited quota:users', () => {
 	describe('GET /users', () => {
 		test('should fail due to missing API Key', async () => {
-			const owner = await createUser({ role: 'global:owner' });
-			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			const authOwnerAgent = testServer.publicApiAgentWithoutApiKey();
 			await authOwnerAgent.get('/users').expect(401);
 		});
 
 		test('should fail due to invalid API Key', async () => {
-			const owner = await createUser({
-				role: 'global:owner',
-				apiKey: randomApiKey(),
-			});
-			owner.apiKey = 'invalid-key';
-			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			const authOwnerAgent = testServer.publicApiAgentWithApiKey('invalid-key');
 			await authOwnerAgent.get('/users').expect(401);
 		});
 
 		test('should fail due to member trying to access owner only endpoint', async () => {
-			const member = await createUser({ apiKey: randomApiKey() });
+			const member = await createMemberWithApiKey();
 			const authMemberAgent = testServer.publicApiAgentFor(member);
 			await authMemberAgent.get('/users').expect(403);
 		});
 
 		test('should return all users', async () => {
-			const owner = await createUser({
-				role: 'global:owner',
-				apiKey: randomApiKey(),
-			});
+			const owner = await createOwnerWithApiKey();
 
 			const authOwnerAgent = testServer.publicApiAgentFor(owner);
 
@@ -92,10 +88,10 @@ describe('With license unlimited quota:users', () => {
 			 * Arrange
 			 */
 			const [owner, firstMember, secondMember, thirdMember] = await Promise.all([
-				createOwner({ withApiKey: true }),
-				createUser({ role: 'global:member' }),
-				createUser({ role: 'global:member' }),
-				createUser({ role: 'global:member' }),
+				createOwnerWithApiKey(),
+				createMember(),
+				createMember(),
+				createMember(),
 			]);
 
 			const [firstProject, secondProject] = await Promise.all([
@@ -130,40 +126,30 @@ describe('With license unlimited quota:users', () => {
 
 	describe('GET /users/:id', () => {
 		test('should fail due to missing API Key', async () => {
-			const owner = await createUser({ role: 'global:owner' });
-			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			const owner = await createOwnerWithApiKey();
+			const authOwnerAgent = testServer.publicApiAgentWithoutApiKey();
 			await authOwnerAgent.get(`/users/${owner.id}`).expect(401);
 		});
 
 		test('should fail due to invalid API Key', async () => {
-			const owner = await createUser({
-				role: 'global:owner',
-				apiKey: randomApiKey(),
-			});
-			owner.apiKey = 'invalid-key';
-			const authOwnerAgent = testServer.publicApiAgentFor(owner);
+			const owner = await createOwnerWithApiKey();
+			const authOwnerAgent = testServer.publicApiAgentWithApiKey('invalid-key');
 			await authOwnerAgent.get(`/users/${owner.id}`).expect(401);
 		});
 
 		test('should fail due to member trying to access owner only endpoint', async () => {
-			const member = await createUser({ apiKey: randomApiKey() });
+			const member = await createMemberWithApiKey();
 			const authMemberAgent = testServer.publicApiAgentFor(member);
 			await authMemberAgent.get(`/users/${member.id}`).expect(403);
 		});
 		test('should return 404 for non-existing id ', async () => {
-			const owner = await createUser({
-				role: 'global:owner',
-				apiKey: randomApiKey(),
-			});
+			const owner = await createOwnerWithApiKey();
 			const authOwnerAgent = testServer.publicApiAgentFor(owner);
 			await authOwnerAgent.get(`/users/${uuid()}`).expect(404);
 		});
 
 		test('should return a pending user', async () => {
-			const owner = await createUser({
-				role: 'global:owner',
-				apiKey: randomApiKey(),
-			});
+			const owner = await createOwnerWithApiKey();
 
 			const { id: memberId } = await createUserShell('global:member');
 
@@ -199,20 +185,13 @@ describe('With license unlimited quota:users', () => {
 
 	describe('GET /users/:email', () => {
 		test('with non-existing email should return 404', async () => {
-			const owner = await createUser({
-				role: 'global:owner',
-				apiKey: randomApiKey(),
-			});
+			const owner = await createOwnerWithApiKey();
 			const authOwnerAgent = testServer.publicApiAgentFor(owner);
 			await authOwnerAgent.get('/users/jhondoe@gmail.com').expect(404);
 		});
 
 		test('should return a user', async () => {
-			const owner = await createUser({
-				role: 'global:owner',
-				apiKey: randomApiKey(),
-			});
-
+			const owner = await createOwnerWithApiKey();
 			const authOwnerAgent = testServer.publicApiAgentFor(owner);
 			const response = await authOwnerAgent.get(`/users/${owner.email}`).expect(200);
 
@@ -249,10 +228,7 @@ describe('With license without quota:users', () => {
 	beforeEach(async () => {
 		mockInstance(License, { getUsersLimit: jest.fn().mockReturnValue(null) });
 
-		const owner = await createUser({
-			role: 'global:owner',
-			apiKey: randomApiKey(),
-		});
+		const owner = await createOwnerWithApiKey();
 		authOwnerAgent = testServer.publicApiAgentFor(owner);
 	});
 
diff --git a/packages/cli/test/integration/public-api/users.test.ts b/packages/cli/test/integration/public-api/users.test.ts
index 48003d838c..0abfee9b1f 100644
--- a/packages/cli/test/integration/public-api/users.test.ts
+++ b/packages/cli/test/integration/public-api/users.test.ts
@@ -1,7 +1,12 @@
 import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import { Telemetry } from '@/telemetry';
 import { mockInstance } from '@test/mocking';
-import { createMember, createOwner, getUserById } from '@test-integration/db/users';
+import {
+	createMember,
+	createMemberWithApiKey,
+	createOwnerWithApiKey,
+	getUserById,
+} from '@test-integration/db/users';
 import { setupTestServer } from '@test-integration/utils';
 
 import * as testDb from '../shared/test-db';
@@ -23,13 +28,12 @@ describe('Users in Public API', () => {
 			/**
 			 * 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);
+			const response = await testServer.publicApiAgentWithApiKey('').post('/users').send(payload);
 
 			/**
 			 * Assert
@@ -42,7 +46,7 @@ describe('Users in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:advancedPermissions');
-			const member = await createMember({ withApiKey: true });
+			const member = await createMemberWithApiKey();
 			const payload = [{ email: 'test@test.com', role: 'global:admin' }];
 
 			/**
@@ -62,7 +66,8 @@ describe('Users in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:advancedPermissions');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
+			await createOwnerWithApiKey();
 			const payload = [{ email: 'test@test.com', role: 'global:admin' }];
 
 			/**
@@ -99,13 +104,12 @@ describe('Users in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: false });
 			const member = await createMember();
 
 			/**
 			 * Act
 			 */
-			const response = await testServer.publicApiAgentFor(owner).delete(`/users/${member.id}`);
+			const response = await testServer.publicApiAgentWithApiKey('').delete(`/users/${member.id}`);
 
 			/**
 			 * Assert
@@ -118,14 +122,14 @@ describe('Users in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:advancedPermissions');
-			const firstMember = await createMember({ withApiKey: true });
+			const member = await createMemberWithApiKey();
 			const secondMember = await createMember();
 
 			/**
 			 * Act
 			 */
 			const response = await testServer
-				.publicApiAgentFor(firstMember)
+				.publicApiAgentFor(member)
 				.delete(`/users/${secondMember.id}`);
 
 			/**
@@ -140,7 +144,7 @@ describe('Users in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:advancedPermissions');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const member = await createMember();
 
 			/**
@@ -161,13 +165,14 @@ describe('Users in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: false });
 			const member = await createMember();
 
 			/**
 			 * Act
 			 */
-			const response = await testServer.publicApiAgentFor(owner).patch(`/users/${member.id}/role`);
+			const response = await testServer
+				.publicApiAgentWithApiKey('')
+				.patch(`/users/${member.id}/role`);
 
 			/**
 			 * Assert
@@ -179,7 +184,7 @@ describe('Users in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const member = await createMember();
 			const payload = { newRoleName: 'global:admin' };
 
@@ -206,7 +211,7 @@ describe('Users in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:advancedPermissions');
-			const firstMember = await createMember({ withApiKey: true });
+			const member = await createMemberWithApiKey();
 			const secondMember = await createMember();
 			const payload = { newRoleName: 'global:admin' };
 
@@ -214,7 +219,7 @@ describe('Users in Public API', () => {
 			 * Act
 			 */
 			const response = await testServer
-				.publicApiAgentFor(firstMember)
+				.publicApiAgentFor(member)
 				.patch(`/users/${secondMember.id}/role`)
 				.send(payload);
 
@@ -230,7 +235,7 @@ describe('Users in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:advancedPermissions');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const member = await createMember();
 			const payload = { newRoleName: 'invalid' };
 
@@ -253,7 +258,7 @@ describe('Users in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:advancedPermissions');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const member = await createMember();
 			const payload = { newRoleName: 'global:admin' };
 
diff --git a/packages/cli/test/integration/public-api/variables.test.ts b/packages/cli/test/integration/public-api/variables.test.ts
index c7f6ba341c..61f75d4641 100644
--- a/packages/cli/test/integration/public-api/variables.test.ts
+++ b/packages/cli/test/integration/public-api/variables.test.ts
@@ -1,5 +1,5 @@
 import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
-import { createOwner } from '@test-integration/db/users';
+import { createOwnerWithApiKey } from '@test-integration/db/users';
 import { createVariable, getVariableOrFail } from '@test-integration/db/variables';
 import { setupTestServer } from '@test-integration/utils';
 
@@ -22,7 +22,7 @@ describe('Variables in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:variables');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const variables = await Promise.all([createVariable(), createVariable(), createVariable()]);
 
 			/**
@@ -48,7 +48,8 @@ describe('Variables in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: true });
+
+			const owner = await createOwnerWithApiKey();
 
 			/**
 			 * Act
@@ -72,7 +73,7 @@ describe('Variables in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:variables');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const variablePayload = { key: 'key', value: 'value' };
 
 			/**
@@ -96,7 +97,7 @@ describe('Variables in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const variablePayload = { key: 'key', value: 'value' };
 
 			/**
@@ -124,7 +125,7 @@ describe('Variables in Public API', () => {
 			 * Arrange
 			 */
 			testServer.license.enable('feat:variables');
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const variable = await createVariable();
 
 			/**
@@ -145,7 +146,7 @@ describe('Variables in Public API', () => {
 			/**
 			 * Arrange
 			 */
-			const owner = await createOwner({ withApiKey: true });
+			const owner = await createOwnerWithApiKey();
 			const variable = await createVariable();
 
 			/**
diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts
index 5bb661eaa3..687b29da6a 100644
--- a/packages/cli/test/integration/public-api/workflows.test.ts
+++ b/packages/cli/test/integration/public-api/workflows.test.ts
@@ -17,9 +17,8 @@ import { createTeamProject } from '@test-integration/db/projects';
 
 import { mockInstance } from '../../shared/mocking';
 import { createTag } from '../shared/db/tags';
-import { createUser } from '../shared/db/users';
+import { createMemberWithApiKey, createOwnerWithApiKey } from '../shared/db/users';
 import { createWorkflow, createWorkflowWithTrigger } from '../shared/db/workflows';
-import { randomApiKey } from '../shared/random';
 import * as testDb from '../shared/test-db';
 import type { SuperAgentTest } from '../shared/types';
 import * as utils from '../shared/utils/';
@@ -40,18 +39,13 @@ const license = testServer.license;
 mockInstance(ExecutionService);
 
 beforeAll(async () => {
-	owner = await createUser({
-		role: 'global:owner',
-		apiKey: randomApiKey(),
-	});
+	owner = await createOwnerWithApiKey();
 	ownerPersonalProject = await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(
 		owner.id,
 	);
 
-	member = await createUser({
-		role: 'global:member',
-		apiKey: randomApiKey(),
-	});
+	member = await createMemberWithApiKey();
+
 	memberPersonalProject = await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(
 		member.id,
 	);
@@ -1518,6 +1512,10 @@ describe('PUT /workflows/:id/transfer', () => {
 		const secondProject = await createTeamProject('second-project', member);
 		const workflow = await createWorkflow({}, firstProject);
 
+		// Make data more similar to real world scenario by injecting additional records into the database
+		await createTeamProject('third-project', member);
+		await createWorkflow({}, firstProject);
+
 		/**
 		 * Act
 		 */
@@ -1529,6 +1527,13 @@ describe('PUT /workflows/:id/transfer', () => {
 		 * Assert
 		 */
 		expect(response.statusCode).toBe(204);
+
+		const workflowsInProjectResponse = await authMemberAgent
+			.get(`/workflows?projectId=${secondProject.id}`)
+			.send();
+
+		expect(workflowsInProjectResponse.statusCode).toBe(200);
+		expect(workflowsInProjectResponse.body.data[0].id).toBe(workflow.id);
 	});
 
 	test('if no destination project, should reject', async () => {
diff --git a/packages/cli/test/integration/runners/task-runner-process.test.ts b/packages/cli/test/integration/runners/task-runner-process.test.ts
new file mode 100644
index 0000000000..f517ee6398
--- /dev/null
+++ b/packages/cli/test/integration/runners/task-runner-process.test.ts
@@ -0,0 +1,91 @@
+import { GlobalConfig } from '@n8n/config';
+import Container from 'typedi';
+
+import { TaskRunnerService } from '@/runners/runner-ws-server';
+import { TaskBroker } from '@/runners/task-broker.service';
+import { TaskRunnerProcess } from '@/runners/task-runner-process';
+import { TaskRunnerServer } from '@/runners/task-runner-server';
+import { retryUntil } from '@test-integration/retry-until';
+
+describe('TaskRunnerProcess', () => {
+	const authToken = 'token';
+	const globalConfig = Container.get(GlobalConfig);
+	globalConfig.taskRunners.authToken = authToken;
+	globalConfig.taskRunners.port = 0; // Use any port
+	const taskRunnerServer = Container.get(TaskRunnerServer);
+
+	const runnerProcess = Container.get(TaskRunnerProcess);
+	const taskBroker = Container.get(TaskBroker);
+	const taskRunnerService = Container.get(TaskRunnerService);
+
+	beforeAll(async () => {
+		await taskRunnerServer.start();
+		// Set the port to the actually used port
+		globalConfig.taskRunners.port = taskRunnerServer.port;
+	});
+
+	afterAll(async () => {
+		await taskRunnerServer.stop();
+	});
+
+	afterEach(async () => {
+		await runnerProcess.stop();
+	});
+
+	const getNumConnectedRunners = () => taskRunnerService.runnerConnections.size;
+	const getNumRegisteredRunners = () => taskBroker.getKnownRunners().size;
+
+	it('should start and connect the task runner', async () => {
+		// Act
+		await runnerProcess.start();
+
+		// Assert
+		expect(runnerProcess.isRunning).toBeTruthy();
+
+		// Wait until the runner has connected
+		await retryUntil(() => expect(getNumConnectedRunners()).toBe(1));
+		expect(getNumRegisteredRunners()).toBe(1);
+	});
+
+	it('should stop an disconnect the task runner', async () => {
+		// Arrange
+		await runnerProcess.start();
+
+		// Wait until the runner has connected
+		await retryUntil(() => expect(getNumConnectedRunners()).toBe(1));
+		expect(getNumRegisteredRunners()).toBe(1);
+
+		// Act
+		await runnerProcess.stop();
+
+		// Assert
+		// Wait until the runner has disconnected
+		await retryUntil(() => expect(getNumConnectedRunners()).toBe(0));
+
+		expect(runnerProcess.isRunning).toBeFalsy();
+		expect(getNumRegisteredRunners()).toBe(0);
+	});
+
+	it('should restart the task runner if it exits', async () => {
+		// Arrange
+		await runnerProcess.start();
+
+		// Wait until the runner has connected
+		await retryUntil(() => expect(getNumConnectedRunners()).toBe(1));
+		const processId = runnerProcess.pid;
+
+		// Act
+		// @ts-expect-error private property
+		runnerProcess.process?.kill('SIGKILL');
+
+		// Assert
+		// Wait until the runner is running again
+		await retryUntil(() => expect(runnerProcess.isRunning).toBeTruthy());
+		expect(runnerProcess.pid).not.toBe(processId);
+
+		// Wait until the runner has connected again
+		await retryUntil(() => expect(getNumConnectedRunners()).toBe(1));
+		expect(getNumConnectedRunners()).toBe(1);
+		expect(getNumRegisteredRunners()).toBe(1);
+	});
+});
diff --git a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
index 8da1f3e1bf..4513beb6bb 100644
--- a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
@@ -159,6 +159,7 @@ test('should report credential in not recently executed workflow', async () => {
 	const savedExecution = await Container.get(ExecutionRepository).save({
 		finished: true,
 		mode: 'manual',
+		createdAt: date,
 		startedAt: date,
 		stoppedAt: date,
 		workflowId: workflow.id,
@@ -227,6 +228,7 @@ test('should not report credentials in recently executed workflow', async () =>
 	const savedExecution = await Container.get(ExecutionRepository).save({
 		finished: true,
 		mode: 'manual',
+		createdAt: date,
 		startedAt: date,
 		stoppedAt: date,
 		workflowId: workflow.id,
diff --git a/packages/cli/test/integration/shared/db/executions.ts b/packages/cli/test/integration/shared/db/executions.ts
index dac3124681..4dd0b4fa76 100644
--- a/packages/cli/test/integration/shared/db/executions.ts
+++ b/packages/cli/test/integration/shared/db/executions.ts
@@ -4,7 +4,7 @@ import Container from 'typedi';
 import type { ExecutionData } from '@/databases/entities/execution-data';
 import type { ExecutionEntity } from '@/databases/entities/execution-entity';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
-import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository';
+import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository.ee';
 import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository';
 import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -39,6 +39,7 @@ export async function createExecution(
 	const execution = await Container.get(ExecutionRepository).save({
 		finished: finished ?? true,
 		mode: mode ?? 'manual',
+		createdAt: new Date(),
 		startedAt: startedAt ?? new Date(),
 		...(workflow !== undefined && { workflowId: workflow.id }),
 		stoppedAt: stoppedAt ?? new Date(),
diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts
index 83192822f9..62f9f39a05 100644
--- a/packages/cli/test/integration/shared/db/users.ts
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -1,8 +1,10 @@
 import { hash } from 'bcryptjs';
+import { randomString } from 'n8n-workflow';
 import Container from 'typedi';
 
 import { AuthIdentity } from '@/databases/entities/auth-identity';
 import { type GlobalRole, type User } from '@/databases/entities/user';
+import { ApiKeyRepository } from '@/databases/repositories/api-key.repository';
 import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository';
 import { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
@@ -79,19 +81,38 @@ export async function createUserWithMfaEnabled(
 	};
 }
 
-export async function createOwner({ withApiKey } = { withApiKey: false }) {
-	if (withApiKey) {
-		return await addApiKey(await createUser({ role: 'global:owner' }));
-	}
+const createApiKeyEntity = (user: User) => {
+	const apiKey = randomApiKey();
+	return Container.get(ApiKeyRepository).create({
+		userId: user.id,
+		label: randomString(10),
+		apiKey,
+	});
+};
 
+export const addApiKey = async (user: User) => {
+	return await Container.get(ApiKeyRepository).save(createApiKeyEntity(user));
+};
+
+export async function createOwnerWithApiKey() {
+	const owner = await createOwner();
+	const apiKey = await addApiKey(owner);
+	owner.apiKeys = [apiKey];
+	return owner;
+}
+
+export async function createMemberWithApiKey() {
+	const member = await createMember();
+	const apiKey = await addApiKey(member);
+	member.apiKeys = [apiKey];
+	return member;
+}
+
+export async function createOwner() {
 	return await createUser({ role: 'global:owner' });
 }
 
-export async function createMember({ withApiKey } = { withApiKey: false }) {
-	if (withApiKey) {
-		return await addApiKey(await createUser({ role: 'global:member' }));
-	}
-
+export async function createMember() {
 	return await createUser({ role: 'global:member' });
 }
 
@@ -128,11 +149,6 @@ export async function createManyUsers(
 	return result.map((result) => result.user);
 }
 
-export async function addApiKey(user: User): Promise<User> {
-	user.apiKey = randomApiKey();
-	return await Container.get(UserRepository).save(user);
-}
-
 export const getAllUsers = async () =>
 	await Container.get(UserRepository).find({
 		relations: ['authIdentities'],
diff --git a/packages/cli/test/integration/shared/retry-until.ts b/packages/cli/test/integration/shared/retry-until.ts
new file mode 100644
index 0000000000..f469149b31
--- /dev/null
+++ b/packages/cli/test/integration/shared/retry-until.ts
@@ -0,0 +1,32 @@
+/**
+ * Retries the given assertion until it passes or the timeout is reached
+ *
+ * @example
+ * await retryUntil(
+ *   () => expect(service.someState).toBe(true)
+ * );
+ */
+export const retryUntil = async (
+	assertion: () => Promise<void> | void,
+	{ interval = 20, timeout = 1000 } = {},
+) => {
+	return await new Promise((resolve, reject) => {
+		const startTime = Date.now();
+
+		const tryAgain = () => {
+			setTimeout(async () => {
+				try {
+					resolve(await assertion());
+				} catch (error) {
+					if (Date.now() - startTime > timeout) {
+						reject(error);
+					} else {
+						tryAgain();
+					}
+				}
+			}, interval);
+		};
+
+		tryAgain();
+	});
+};
diff --git a/packages/cli/test/integration/shared/test-db.ts b/packages/cli/test/integration/shared/test-db.ts
index 365bc81fa8..7faaa3f6eb 100644
--- a/packages/cli/test/integration/shared/test-db.ts
+++ b/packages/cli/test/integration/shared/test-db.ts
@@ -67,6 +67,7 @@ const repositories = [
 	'Project',
 	'ProjectRelation',
 	'Role',
+	'ProcessedData',
 	'Project',
 	'ProjectRelation',
 	'Settings',
@@ -80,6 +81,7 @@ const repositories = [
 	'WorkflowHistory',
 	'WorkflowStatistics',
 	'WorkflowTagMapping',
+	'ApiKey',
 ] as const;
 
 /**
@@ -87,9 +89,18 @@ const repositories = [
  */
 export async function truncate(names: Array<(typeof repositories)[number]>) {
 	for (const name of names) {
-		const RepositoryClass: Class<Repository<object>> =
-			// eslint-disable-next-line n8n-local-rules/no-dynamic-import-template
-			(await import(`@/databases/repositories/${kebabCase(name)}.repository`))[`${name}Repository`];
+		let RepositoryClass: Class<Repository<object>>;
+
+		try {
+			RepositoryClass = (await import(`@/databases/repositories/${kebabCase(name)}.repository`))[
+				`${name}Repository`
+			];
+		} catch (e) {
+			RepositoryClass = (await import(`@/databases/repositories/${kebabCase(name)}.repository.ee`))[
+				`${name}Repository`
+			];
+		}
+
 		await Container.get(RepositoryClass).delete({});
 	}
 }
diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts
index 66ca2d016f..8dc922dda2 100644
--- a/packages/cli/test/integration/shared/types.ts
+++ b/packages/cli/test/integration/shared/types.ts
@@ -40,7 +40,8 @@ type EndpointGroup =
 	| 'debug'
 	| 'project'
 	| 'role'
-	| 'dynamic-node-parameters';
+	| 'dynamic-node-parameters'
+	| 'apiKeys';
 
 export interface SetupProps {
 	endpointGroups?: EndpointGroup[];
@@ -55,6 +56,8 @@ export interface TestServer {
 	httpServer: Server;
 	authAgentFor: (user: User) => TestAgent;
 	publicApiAgentFor: (user: User) => TestAgent;
+	publicApiAgentWithApiKey: (apiKey: string) => TestAgent;
+	publicApiAgentWithoutApiKey: () => TestAgent;
 	authlessAgent: TestAgent;
 	restlessAgent: TestAgent;
 	license: LicenseMocker;
diff --git a/packages/cli/test/integration/shared/utils/test-command.ts b/packages/cli/test/integration/shared/utils/test-command.ts
index 82effd1818..d0737ddcc1 100644
--- a/packages/cli/test/integration/shared/utils/test-command.ts
+++ b/packages/cli/test/integration/shared/utils/test-command.ts
@@ -4,7 +4,7 @@ import type { Class } from 'n8n-core';
 
 import type { BaseCommand } from '@/commands/base-command';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
-import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
+import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay';
 import { mockInstance } from '@test/mocking';
 
 import * as testDb from '../test-db';
diff --git a/packages/cli/test/integration/shared/utils/test-server.ts b/packages/cli/test/integration/shared/utils/test-server.ts
index f16bbf9833..b69f21499a 100644
--- a/packages/cli/test/integration/shared/utils/test-server.ts
+++ b/packages/cli/test/integration/shared/utils/test-server.ts
@@ -11,7 +11,7 @@ import { AUTH_COOKIE_NAME } from '@/constants';
 import type { User } from '@/databases/entities/user';
 import { ControllerRegistry } from '@/decorators';
 import { License } from '@/license';
-import { Logger } from '@/logger';
+import { Logger } from '@/logging/logger.service';
 import { rawBodyReader, bodyParser } from '@/middlewares';
 import { PostHogClient } from '@/posthog';
 import { Push } from '@/push';
@@ -62,17 +62,30 @@ function createAgent(
 	return agent;
 }
 
-function publicApiAgent(
+const userDoesNotHaveApiKey = (user: User) => {
+	return !user.apiKeys || !Array.from(user.apiKeys) || user.apiKeys.length === 0;
+};
+
+const publicApiAgent = (
 	app: express.Application,
-	{ user, version = 1 }: { user: User; version?: number },
-) {
+	{ user, apiKey, version = 1 }: { user?: User; apiKey?: string; version?: number },
+) => {
+	if (user && apiKey) {
+		throw new Error('Cannot provide both user and API key');
+	}
+
+	if (user && userDoesNotHaveApiKey(user)) {
+		throw new Error('User does not have an API key');
+	}
+
+	const agentApiKey = apiKey ?? user?.apiKeys[0].apiKey;
+
 	const agent = request.agent(app);
 	void agent.use(prefix(`${PUBLIC_API_REST_PATH_SEGMENT}/v${version}`));
-	if (user.apiKey) {
-		void agent.set({ 'X-N8N-API-KEY': user.apiKey });
-	}
+	if (!user && !apiKey) return agent;
+	void agent.set({ 'X-N8N-API-KEY': agentApiKey });
 	return agent;
-}
+};
 
 export const setupTestServer = ({
 	endpointGroups,
@@ -100,6 +113,8 @@ export const setupTestServer = ({
 		authlessAgent: createAgent(app),
 		restlessAgent: createAgent(app, { auth: false, noRest: true }),
 		publicApiAgentFor: (user) => publicApiAgent(app, { user }),
+		publicApiAgentWithApiKey: (apiKey) => publicApiAgent(app, { apiKey }),
+		publicApiAgentWithoutApiKey: () => publicApiAgent(app, {}),
 		license: new LicenseMocker(),
 	};
 
@@ -140,7 +155,7 @@ export const setupTestServer = ({
 			for (const group of endpointGroups) {
 				switch (group) {
 					case 'annotationTags':
-						await import('@/controllers/annotation-tags.controller');
+						await import('@/controllers/annotation-tags.controller.ee');
 						break;
 
 					case 'credentials':
@@ -258,6 +273,10 @@ export const setupTestServer = ({
 					case 'dynamic-node-parameters':
 						await import('@/controllers/dynamic-node-parameters.controller');
 						break;
+
+					case 'apiKeys':
+						await import('@/controllers/api-keys.controller');
+						break;
 				}
 			}
 
diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
index c8f2db889f..2002843bfe 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
@@ -5,6 +5,7 @@ import { v4 as uuid } from 'uuid';
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import config from '@/config';
 import type { Project } from '@/databases/entities/project';
+import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
@@ -1385,18 +1386,6 @@ describe('PUT /:workflowId/transfer', () => {
 			.expect(400);
 	});
 
-	test('cannot transfer into a personal project', async () => {
-		const sourceProject = await createTeamProject('Team Project', member);
-
-		const workflow = await createWorkflow({}, sourceProject);
-
-		await testServer
-			.authAgentFor(member)
-			.put(`/workflows/${workflow.id}/transfer`)
-			.send({ destinationProjectId: memberPersonalProject.id })
-			.expect(400);
-	});
-
 	test('cannot transfer somebody elses workflow', async () => {
 		const destinationProject = await createTeamProject('Team Project', member);
 
@@ -1421,180 +1410,133 @@ describe('PUT /:workflowId/transfer', () => {
 			.expect(404);
 	});
 
-	test('project:editors cannot transfer workflows', async () => {
-		//
-		// ARRANGE
-		//
-		const sourceProject = await createTeamProject();
-		await linkUserToProject(member, sourceProject, 'project:editor');
-
-		const workflow = await createWorkflow({}, sourceProject);
-
-		const destinationProject = await createTeamProject();
-		await linkUserToProject(member, destinationProject, 'project:admin');
-
-		//
-		// ACT & ASSERT
-		//
-		await testServer
-			.authAgentFor(member)
-			.put(`/workflows/${workflow.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(403);
-	});
-
-	test('transferring from a personal project to a team project severs all sharings', async () => {
-		//
-		// ARRANGE
-		//
-		const workflow = await createWorkflow({}, member);
-
-		// these sharings should be deleted by the transfer
-		await shareWorkflowWithUsers(workflow, [anotherMember, owner]);
-
-		const destinationProject = await createTeamProject('Team Project', member);
-
-		//
-		// ACT
-		//
-		const response = await testServer
-			.authAgentFor(member)
-			.put(`/workflows/${workflow.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(200);
-
-		//
-		// ASSERT
-		//
-		expect(response.body).toEqual({});
-
-		const allSharings = await getWorkflowSharing(workflow);
-		expect(allSharings).toHaveLength(1);
-		expect(allSharings[0]).toMatchObject({
-			projectId: destinationProject.id,
-			workflowId: workflow.id,
-			role: 'workflow:owner',
-		});
-	});
-
-	test('can transfer from team to another team project', async () => {
-		//
-		// ARRANGE
-		//
-		const sourceProject = await createTeamProject('Team Project 1', member);
-		const workflow = await createWorkflow({}, sourceProject);
-
-		const destinationProject = await createTeamProject('Team Project 2', member);
-
-		//
-		// ACT
-		//
-		const response = await testServer
-			.authAgentFor(member)
-			.put(`/workflows/${workflow.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(200);
-
-		//
-		// ASSERT
-		//
-		expect(response.body).toEqual({});
-
-		const allSharings = await getWorkflowSharing(workflow);
-		expect(allSharings).toHaveLength(1);
-		expect(allSharings[0]).toMatchObject({
-			projectId: destinationProject.id,
-			workflowId: workflow.id,
-			role: 'workflow:owner',
-		});
-	});
-
-	test.each([
-		['owners', () => owner],
-		['admins', () => admin],
-	])(
-		'global %s can always transfer from any personal or team project into any team project',
-		async (_name, actor) => {
+	test.each<ProjectRole>(['project:editor', 'project:viewer'])(
+		'%ss cannot transfer workflows',
+		async (projectRole) => {
 			//
 			// ARRANGE
 			//
-			const sourceProject = await createTeamProject('Source Project', member);
-			const teamWorkflow = await createWorkflow({}, sourceProject);
+			const sourceProject = await createTeamProject();
+			await linkUserToProject(member, sourceProject, projectRole);
 
-			const personalWorkflow = await createWorkflow({}, member);
+			const workflow = await createWorkflow({}, sourceProject);
 
-			const destinationProject = await createTeamProject('Destination Project', member);
+			const destinationProject = await createTeamProject();
+			await linkUserToProject(member, destinationProject, 'project:admin');
 
 			//
-			// ACT
+			// ACT & ASSERT
 			//
-			const response1 = await testServer
-				.authAgentFor(actor())
-				.put(`/workflows/${teamWorkflow.id}/transfer`)
+			await testServer
+				.authAgentFor(member)
+				.put(`/workflows/${workflow.id}/transfer`)
 				.send({ destinationProjectId: destinationProject.id })
-				.expect(200);
-			const response2 = await testServer
-				.authAgentFor(actor())
-				.put(`/workflows/${personalWorkflow.id}/transfer`)
-				.send({ destinationProjectId: destinationProject.id })
-				.expect(200);
-
-			//
-			// ASSERT
-			//
-			expect(response1.body).toEqual({});
-			expect(response2.body).toEqual({});
-
-			{
-				const allSharings = await getWorkflowSharing(teamWorkflow);
-				expect(allSharings).toHaveLength(1);
-				expect(allSharings[0]).toMatchObject({
-					projectId: destinationProject.id,
-					workflowId: teamWorkflow.id,
-					role: 'workflow:owner',
-				});
-			}
-
-			{
-				const allSharings = await getWorkflowSharing(personalWorkflow);
-				expect(allSharings).toHaveLength(1);
-				expect(allSharings[0]).toMatchObject({
-					projectId: destinationProject.id,
-					workflowId: personalWorkflow.id,
-					role: 'workflow:owner',
-				});
-			}
+				.expect(403);
 		},
 	);
 
-	test.each([
-		['owners', () => owner],
-		['admins', () => admin],
-	])('global %s cannot transfer into personal projects', async (_name, actor) => {
-		//
-		// ARRANGE
-		//
-		const sourceProject = await createTeamProject('Source Project', member);
-		const teamWorkflow = await createWorkflow({}, sourceProject);
+	test.each<
+		[
+			// user role
+			'owners' | 'admins',
+			// source project type
+			'team' | 'personal',
+			// destination project type
+			'team' | 'personal',
+			// actor
+			() => User,
+			// source project
+			() => Promise<Project> | Project,
+			// destination project
+			() => Promise<Project> | Project,
+		]
+	>([
+		// owner
+		[
+			'owners',
+			'team',
+			'team',
+			() => owner,
+			async () => await createTeamProject('Source Project'),
+			async () => await createTeamProject('Destination Project'),
+		],
+		[
+			'owners',
+			'team',
+			'personal',
+			() => owner,
+			async () => await createTeamProject('Source Project'),
+			() => memberPersonalProject,
+		],
+		[
+			'owners',
+			'personal',
+			'team',
+			() => owner,
+			() => memberPersonalProject,
+			async () => await createTeamProject('Destination Project'),
+		],
 
-		const personalWorkflow = await createWorkflow({}, member);
+		// admin
+		[
+			'admins',
+			'team',
+			'team',
+			() => admin,
+			async () => await createTeamProject('Source Project'),
+			async () => await createTeamProject('Destination Project'),
+		],
+		[
+			'admins',
+			'team',
+			'personal',
+			() => admin,
+			async () => await createTeamProject('Source Project'),
+			() => memberPersonalProject,
+		],
+		[
+			'admins',
+			'personal',
+			'team',
+			() => admin,
+			() => memberPersonalProject,
+			async () => await createTeamProject('Destination Project'),
+		],
+	])(
+		'global %s can transfer workflows from a %s project to a %s project',
+		async (
+			_roleName,
+			_sourceProjectName,
+			_destinationProjectName,
+			getActor,
+			getSourceProject,
+			getDestinationProject,
+		) => {
+			// ARRANGE
+			const actor = getActor();
+			const sourceProject = await getSourceProject();
+			const destinationProject = await getDestinationProject();
+			const workflow = await createWorkflow({}, sourceProject);
 
-		const destinationProject = anotherMemberPersonalProject;
+			// ACT
+			const response = await testServer
+				.authAgentFor(actor)
+				.put(`/workflows/${workflow.id}/transfer`)
+				.send({ destinationProjectId: destinationProject.id })
+				.expect(200);
 
-		//
-		// ACT & ASSERT
-		//
-		await testServer
-			.authAgentFor(actor())
-			.put(`/workflows/${teamWorkflow.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(400);
-		await testServer
-			.authAgentFor(actor())
-			.put(`/workflows/${personalWorkflow.id}/transfer`)
-			.send({ destinationProjectId: destinationProject.id })
-			.expect(400);
-	});
+			// ASSERT
+			expect(response.body).toEqual({});
+
+			const allSharings = await getWorkflowSharing(workflow);
+			expect(allSharings).toHaveLength(1);
+			expect(allSharings[0]).toMatchObject({
+				projectId: destinationProject.id,
+				workflowId: workflow.id,
+				role: 'workflow:owner',
+			});
+		},
+	);
 
 	test('removes and re-adds the workflow from the active workflow manager during the transfer', async () => {
 		//
diff --git a/packages/cli/test/shared/mocking.ts b/packages/cli/test/shared/mocking.ts
index 60b712b115..099988a896 100644
--- a/packages/cli/test/shared/mocking.ts
+++ b/packages/cli/test/shared/mocking.ts
@@ -4,6 +4,8 @@ import type { Class } from 'n8n-core';
 import type { DeepPartial } from 'ts-essentials';
 import { Container } from 'typedi';
 
+import type { Logger } from '@/logging/logger.service';
+
 export const mockInstance = <T>(
 	serviceClass: Class<T>,
 	data: DeepPartial<T> | undefined = undefined,
@@ -22,3 +24,6 @@ export const mockEntityManager = (entityClass: Class) => {
 	Object.assign(entityManager, { connection: dataSource });
 	return entityManager;
 };
+
+export const mockLogger = () =>
+	mock<Logger>({ withScope: jest.fn().mockReturnValue(mock<Logger>()) });
diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js
index cd962bad5c..9bfae8a9eb 100644
--- a/packages/core/.eslintrc.js
+++ b/packages/core/.eslintrc.js
@@ -18,7 +18,6 @@ module.exports = {
 		complexity: 'error',
 
 		// TODO: Remove this
-		'import/order': 'off',
 		'@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': true }],
 	},
 };
diff --git a/packages/core/bin/generate-ui-types b/packages/core/bin/generate-ui-types
index 8cecb6b054..f73ca87a15 100755
--- a/packages/core/bin/generate-ui-types
+++ b/packages/core/bin/generate-ui-types
@@ -30,18 +30,6 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 	const loader = new PackageDirectoryLoader(packageDir);
 	await loader.loadAll();
 
-	const knownCredentials = loader.known.credentials;
-	const credentialTypes = Object.values(loader.credentialTypes).map((data) => {
-		const credentialType = data.type;
-		if (
-			knownCredentials[credentialType.name].supportedNodes?.length > 0 &&
-			credentialType.httpRequestNode
-		) {
-			credentialType.httpRequestNode.hidden = true;
-		}
-		return credentialType;
-	});
-
 	const loaderNodeTypes = Object.values(loader.nodeTypes);
 
 	const definedMethods = loaderNodeTypes.reduce((acc, cur) => {
@@ -76,6 +64,36 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 			}),
 		);
 
+	const knownCredentials = loader.known.credentials;
+	const credentialTypes = Object.values(loader.credentialTypes).map((data) => {
+		const credentialType = data.type;
+		const supportedNodes = knownCredentials[credentialType.name].supportedNodes ?? [];
+		if (supportedNodes.length > 0 && credentialType.httpRequestNode) {
+			credentialType.httpRequestNode.hidden = true;
+		}
+
+		credentialType.supportedNodes = supportedNodes;
+
+		if (!credentialType.iconUrl && !credentialType.icon) {
+			for (const supportedNode of supportedNodes) {
+				const nodeType = loader.nodeTypes[supportedNode]?.type.description;
+
+				if (!nodeType) continue;
+				if (nodeType.icon) {
+					credentialType.icon = nodeType.icon;
+					credentialType.iconColor = nodeType.iconColor;
+					break;
+				}
+				if (nodeType.iconUrl) {
+					credentialType.iconUrl = nodeType.iconUrl;
+					break;
+				}
+			}
+		}
+
+		return credentialType;
+	});
+
 	const referencedMethods = findReferencedMethods(nodeTypes);
 
 	await Promise.all([
diff --git a/packages/core/package.json b/packages/core/package.json
index 74e3483943..95cf23efa6 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "1.61.0",
+  "version": "1.63.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
index bfc6319626..93e67488d5 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/ActiveWorkflows.ts
@@ -1,5 +1,3 @@
-import { Service } from 'typedi';
-
 import type {
 	IGetExecutePollFunctions,
 	IGetExecuteTriggerFunctions,
@@ -20,9 +18,10 @@ import {
 	WorkflowActivationError,
 	WorkflowDeactivationError,
 } from 'n8n-workflow';
+import { Service } from 'typedi';
 
-import { ScheduledTaskManager } from './ScheduledTaskManager';
 import type { IWorkflowData } from './Interfaces';
+import { ScheduledTaskManager } from './ScheduledTaskManager';
 
 @Service()
 export class ActiveWorkflows {
diff --git a/packages/core/src/Agent/index.ts b/packages/core/src/Agent/index.ts
new file mode 100644
index 0000000000..ed842d99ee
--- /dev/null
+++ b/packages/core/src/Agent/index.ts
@@ -0,0 +1,61 @@
+import type {
+	IExecuteFunctions,
+	Workflow,
+	IRunExecutionData,
+	INodeExecutionData,
+	ITaskDataConnections,
+	INode,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+	INodeParameters,
+	IExecuteData,
+	IDataObject,
+	Result,
+} from 'n8n-workflow';
+import { createEnvProviderState } from 'n8n-workflow';
+
+export const createAgentStartJob = (
+	additionalData: IWorkflowExecuteAdditionalData,
+	inputData: ITaskDataConnections,
+	node: INode,
+	workflow: Workflow,
+	runExecutionData: IRunExecutionData,
+	runIndex: number,
+	activeNodeName: string,
+	connectionInputData: INodeExecutionData[],
+	siblingParameters: INodeParameters,
+	mode: WorkflowExecuteMode,
+	executeData?: IExecuteData,
+	defaultReturnRunIndex?: number,
+	selfData?: IDataObject,
+	contextNodeName?: string,
+): IExecuteFunctions['startJob'] => {
+	return async function startJob<T = unknown, E = unknown>(
+		this: IExecuteFunctions,
+		jobType: string,
+		settings: unknown,
+		itemIndex: number,
+	): Promise<Result<T, E>> {
+		return await additionalData.startAgentJob<T, E>(
+			additionalData,
+			jobType,
+			settings,
+			this,
+			inputData,
+			node,
+			workflow,
+			runExecutionData,
+			runIndex,
+			itemIndex,
+			activeNodeName,
+			connectionInputData,
+			siblingParameters,
+			mode,
+			createEnvProviderState(),
+			executeData,
+			defaultReturnRunIndex,
+			selfData,
+			contextNodeName,
+		);
+	};
+};
diff --git a/packages/core/src/BinaryData/BinaryData.service.ts b/packages/core/src/BinaryData/BinaryData.service.ts
index 20903aa71c..556a3176de 100644
--- a/packages/core/src/BinaryData/BinaryData.service.ts
+++ b/packages/core/src/BinaryData/BinaryData.service.ts
@@ -1,14 +1,14 @@
+import { BINARY_ENCODING } from 'n8n-workflow';
+import type { INodeExecutionData, IBinaryData } from 'n8n-workflow';
 import { readFile, stat } from 'node:fs/promises';
 import prettyBytes from 'pretty-bytes';
-import Container, { Service } from 'typedi';
-import { BINARY_ENCODING } from 'n8n-workflow';
-import { InvalidModeError } from '../errors/invalid-mode.error';
-import { areConfigModes, binaryToBuffer } from './utils';
-
 import type { Readable } from 'stream';
+import Container, { Service } from 'typedi';
+
 import type { BinaryData } from './types';
-import type { INodeExecutionData, IBinaryData } from 'n8n-workflow';
+import { areConfigModes, binaryToBuffer } from './utils';
 import { InvalidManagerError } from '../errors/invalid-manager.error';
+import { InvalidModeError } from '../errors/invalid-mode.error';
 
 @Service()
 export class BinaryDataService {
diff --git a/packages/core/src/BinaryData/FileSystem.manager.ts b/packages/core/src/BinaryData/FileSystem.manager.ts
index 5b7250d9eb..f49e6e5c02 100644
--- a/packages/core/src/BinaryData/FileSystem.manager.ts
+++ b/packages/core/src/BinaryData/FileSystem.manager.ts
@@ -1,13 +1,13 @@
+import { jsonParse } from 'n8n-workflow';
 import { createReadStream } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import type { Readable } from 'stream';
 import { v4 as uuid } from 'uuid';
-import { jsonParse } from 'n8n-workflow';
+
+import type { BinaryData } from './types';
 import { assertDir, doesNotExist } from './utils';
 import { DisallowedFilepathError } from '../errors/disallowed-filepath.error';
-
-import type { Readable } from 'stream';
-import type { BinaryData } from './types';
 import { FileNotFoundError } from '../errors/file-not-found.error';
 
 const EXECUTION_ID_EXTRACTOR =
diff --git a/packages/core/src/BinaryData/ObjectStore.manager.ts b/packages/core/src/BinaryData/ObjectStore.manager.ts
index 6f7bb3ef29..65827d4ef0 100644
--- a/packages/core/src/BinaryData/ObjectStore.manager.ts
+++ b/packages/core/src/BinaryData/ObjectStore.manager.ts
@@ -1,12 +1,12 @@
 import fs from 'node:fs/promises';
+import type { Readable } from 'node:stream';
 import { Service } from 'typedi';
 import { v4 as uuid } from 'uuid';
+
+import type { BinaryData } from './types';
 import { binaryToBuffer } from './utils';
 import { ObjectStoreService } from '../ObjectStore/ObjectStore.service.ee';
 
-import type { Readable } from 'node:stream';
-import type { BinaryData } from './types';
-
 @Service()
 export class ObjectStoreManager implements BinaryData.Manager {
 	constructor(private readonly objectStoreService: ObjectStoreService) {}
diff --git a/packages/core/src/BinaryData/utils.ts b/packages/core/src/BinaryData/utils.ts
index c64cb4315b..bedda5be12 100644
--- a/packages/core/src/BinaryData/utils.ts
+++ b/packages/core/src/BinaryData/utils.ts
@@ -1,7 +1,8 @@
+import concatStream from 'concat-stream';
 import fs from 'node:fs/promises';
 import type { Readable } from 'node:stream';
+
 import type { BinaryData } from './types';
-import concatStream from 'concat-stream';
 
 export const CONFIG_MODES = ['default', 'filesystem', 's3'] as const;
 
diff --git a/packages/core/src/Cipher.ts b/packages/core/src/Cipher.ts
index 4e1b649bed..d9ed93ddb6 100644
--- a/packages/core/src/Cipher.ts
+++ b/packages/core/src/Cipher.ts
@@ -1,5 +1,6 @@
-import { Service } from 'typedi';
 import { createHash, createCipheriv, createDecipheriv, randomBytes } from 'crypto';
+import { Service } from 'typedi';
+
 import { InstanceSettings } from './InstanceSettings';
 
 // Data encrypted by CryptoJS always starts with these bytes
diff --git a/packages/core/src/CreateNodeAsTool.ts b/packages/core/src/CreateNodeAsTool.ts
index 21e1b6352a..1466f57d09 100644
--- a/packages/core/src/CreateNodeAsTool.ts
+++ b/packages/core/src/CreateNodeAsTool.ts
@@ -1,296 +1,435 @@
-/**
- * @module NodeAsTool
- * @description This module converts n8n nodes into LangChain tools by analyzing node parameters,
- * identifying placeholders, and generating a Zod schema. It then creates a DynamicStructuredTool
- * that can be used in LangChain workflows.
- *
- * General approach:
- * 1. Recursively traverse node parameters to find placeholders, including in nested structures
- * 2. Generate a Zod schema based on these placeholders, preserving the nested structure
- * 3. Create a DynamicStructuredTool with the schema and a function that executes the n8n node
- *
- * Example:
- * - Node parameters:
- *   {
- *     "inputText": "{{ '__PLACEHOLDER: Enter main text to process' }}",
- *     "options": {
- *       "language": "{{ '__PLACEHOLDER: Specify language' }}",
- *       "advanced": {
- *         "maxLength": "{{ '__PLACEHOLDER: Enter maximum length' }}"
- *       }
- *     }
- *   }
- *
- * - Generated Zod schema:
- *   z.object({
- *     "inputText": z.string().describe("Enter main text to process"),
- *     "options__language": z.string().describe("Specify language"),
- *     "options__advanced__maxLength": z.string().describe("Enter maximum length")
- *   }).required()
- *
- * - Resulting tool can be called with:
- *   {
- *     "inputText": "Hello, world!",
- *     "options__language": "en",
- *     "options__advanced__maxLength": "100"
- *   }
- *
- * Note: Nested properties are flattened with double underscores in the schema,
- * but the tool reconstructs the original nested structure when executing the node.
- */
-
 import { DynamicStructuredTool } from '@langchain/core/tools';
-import {
-	NodeConnectionType,
-	type IExecuteFunctions,
-	type INodeParameters,
-	type INodeType,
-} from 'n8n-workflow';
+import type { IExecuteFunctions, INodeParameters, INodeType } from 'n8n-workflow';
+import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import { z } from 'zod';
 
-/** Represents a nested object structure */
-type NestedObject = { [key: string]: unknown };
-
-/**
- * Encodes a dot-notated key to a format safe for use as an object key.
- * @param {string} key - The dot-notated key to encode.
- * @returns {string} The encoded key.
- */
-function encodeDotNotation(key: string): string {
-	// Replace dots with double underscores, then handle special case for '__value' for complicated params
-	return key.replace(/\./g, '__').replace('__value', '');
+type AllowedTypes = 'string' | 'number' | 'boolean' | 'json';
+interface FromAIArgument {
+	key: string;
+	description?: string;
+	type?: AllowedTypes;
+	defaultValue?: string | number | boolean | Record<string, unknown>;
 }
 
 /**
- * Decodes an encoded key back to its original dot-notated form.
- * @param {string} key - The encoded key to decode.
- * @returns {string} The decoded, dot-notated key.
+ * AIParametersParser
+ *
+ * This class encapsulates the logic for parsing node parameters, extracting $fromAI calls,
+ * generating Zod schemas, and creating LangChain tools.
  */
-function decodeDotNotation(key: string): string {
-	// Simply replace double underscores with dots
-	return key.replace(/__/g, '.');
-}
+class AIParametersParser {
+	private ctx: IExecuteFunctions;
 
-/**
- * Recursively traverses an object to find placeholder values.
- * @param {NestedObject} obj - The object to traverse.
- * @param {string[]} path - The current path in the object.
- * @param {Map<string, string>} results - Map to store found placeholders.
- * @returns {Map<string, string>} Updated map of placeholders.
- */
-function traverseObject(
-	obj: NestedObject,
-	path: string[] = [],
-	results: Map<string, string> = new Map(),
-): Map<string, string> {
-	for (const [key, value] of Object.entries(obj)) {
-		const currentPath = [...path, key];
-		const fullPath = currentPath.join('.');
+	/**
+	 * Constructs an instance of AIParametersParser.
+	 * @param ctx The execution context.
+	 */
+	constructor(ctx: IExecuteFunctions) {
+		this.ctx = ctx;
+	}
 
-		if (typeof value === 'string' && value.startsWith("{{ '__PLACEHOLDER")) {
-			// Store placeholder values with their full path
-			results.set(encodeDotNotation(fullPath), value);
-		} else if (Array.isArray(value)) {
-			// Recursively traverse arrays
-			// eslint-disable-next-line @typescript-eslint/no-use-before-define
-			traverseArray(value, currentPath, results);
-		} else if (typeof value === 'object' && value !== null) {
-			// Recursively traverse nested objects, but only if they're not empty
-			if (Object.keys(value).length > 0) {
-				traverseObject(value as NestedObject, currentPath, results);
-			}
+	/**
+	 * Generates a Zod schema based on the provided FromAIArgument placeholder.
+	 * @param placeholder The FromAIArgument object containing key, type, description, and defaultValue.
+	 * @returns A Zod schema corresponding to the placeholder's type and constraints.
+	 */
+	private generateZodSchema(placeholder: FromAIArgument): z.ZodTypeAny {
+		let schema: z.ZodTypeAny;
+
+		switch (placeholder.type?.toLowerCase()) {
+			case 'string':
+				schema = z.string();
+				break;
+			case 'number':
+				schema = z.number();
+				break;
+			case 'boolean':
+				schema = z.boolean();
+				break;
+			case 'json':
+				schema = z.record(z.any());
+				break;
+			default:
+				schema = z.string();
+		}
+
+		if (placeholder.description) {
+			schema = schema.describe(`${schema.description ?? ''} ${placeholder.description}`.trim());
+		}
+
+		if (placeholder.defaultValue !== undefined) {
+			schema = schema.default(placeholder.defaultValue);
+		}
+
+		return schema;
+	}
+
+	/**
+	 * Recursively traverses the nodeParameters object to find all $fromAI calls.
+	 * @param payload The current object or value being traversed.
+	 * @param collectedArgs The array collecting FromAIArgument objects.
+	 */
+	private traverseNodeParameters(payload: unknown, collectedArgs: FromAIArgument[]) {
+		if (typeof payload === 'string') {
+			const fromAICalls = this.extractFromAICalls(payload);
+			fromAICalls.forEach((call) => collectedArgs.push(call));
+		} else if (Array.isArray(payload)) {
+			payload.forEach((item: unknown) => this.traverseNodeParameters(item, collectedArgs));
+		} else if (typeof payload === 'object' && payload !== null) {
+			Object.values(payload).forEach((value) => this.traverseNodeParameters(value, collectedArgs));
 		}
 	}
 
-	return results;
-}
+	/**
+	 * Extracts all $fromAI calls from a given string
+	 * @param str The string to search for $fromAI calls.
+	 * @returns An array of FromAIArgument objects.
+	 *
+	 * This method uses a regular expression to find the start of each $fromAI function call
+	 * in the input string. It then employs a character-by-character parsing approach to
+	 * accurately extract the arguments of each call, handling nested parentheses and quoted strings.
+	 *
+	 * The parsing process:
+	 * 1. Finds the starting position of a $fromAI call using regex.
+	 * 2. Iterates through characters, keeping track of parentheses depth and quote status.
+	 * 3. Handles escaped characters within quotes to avoid premature quote closing.
+	 * 4. Builds the argument string until the matching closing parenthesis is found.
+	 * 5. Parses the extracted argument string into a FromAIArgument object.
+	 * 6. Repeats the process for all $fromAI calls in the input string.
+	 *
+	 */
+	private extractFromAICalls(str: string): FromAIArgument[] {
+		const args: FromAIArgument[] = [];
+		// Regular expression to match the start of a $fromAI function call
+		const pattern = /\$fromAI\s*\(\s*/gi;
+		let match: RegExpExecArray | null;
 
-/**
- * Recursively traverses an array to find placeholder values.
- * @param {unknown[]} arr - The array to traverse.
- * @param {string[]} path - The current path in the array.
- * @param {Map<string, string>} results - Map to store found placeholders.
- */
-function traverseArray(arr: unknown[], path: string[], results: Map<string, string>): void {
-	arr.forEach((item, index) => {
-		const currentPath = [...path, index.toString()];
-		const fullPath = currentPath.join('.');
+		while ((match = pattern.exec(str)) !== null) {
+			const startIndex = match.index + match[0].length;
+			let current = startIndex;
+			let inQuotes = false;
+			let quoteChar = '';
+			let parenthesesCount = 1;
+			let argsString = '';
 
-		if (typeof item === 'string' && item.startsWith("{{ '__PLACEHOLDER")) {
-			// Store placeholder values with their full path
-			results.set(encodeDotNotation(fullPath), item);
-		} else if (Array.isArray(item)) {
-			// Recursively traverse nested arrays
-			traverseArray(item, currentPath, results);
-		} else if (typeof item === 'object' && item !== null) {
-			// Recursively traverse nested objects
-			traverseObject(item as NestedObject, currentPath, results);
-		}
-	});
-}
+			// Parse the arguments string, handling nested parentheses and quotes
+			while (current < str.length && parenthesesCount > 0) {
+				const char = str[current];
 
-/**
- * Builds a nested object structure from matching keys and their values.
- * @param {string} baseKey - The base key to start building from.
- * @param {string[]} matchingKeys - Array of matching keys.
- * @param {Record<string, string>} values - Object containing values for the keys.
- * @returns {Record<string, unknown>} The built nested object structure.
- */
-function buildStructureFromMatches(
-	baseKey: string,
-	matchingKeys: string[],
-	values: Record<string, string>,
-): Record<string, unknown> {
-	const result = {};
+				if (inQuotes) {
+					// Handle characters inside quotes, including escaped characters
+					if (char === '\\' && current + 1 < str.length) {
+						argsString += char + str[current + 1];
+						current += 2;
+						continue;
+					}
 
-	for (const matchingKey of matchingKeys) {
-		const decodedKey = decodeDotNotation(matchingKey);
-		// Extract the part of the key after the base key
-		const remainingPath = decodedKey
-			.slice(baseKey.length)
-			.split('.')
-			.filter((k) => k !== '');
-		let current: Record<string, unknown> = result;
+					if (char === quoteChar) {
+						inQuotes = false;
+						quoteChar = '';
+					}
+					argsString += char;
+				} else {
+					// Handle characters outside quotes
+					if (['"', "'", '`'].includes(char)) {
+						inQuotes = true;
+						quoteChar = char;
+					} else if (char === '(') {
+						parenthesesCount++;
+					} else if (char === ')') {
+						parenthesesCount--;
+					}
 
-		// Build the nested structure
-		for (let i = 0; i < remainingPath.length - 1; i++) {
-			if (!(remainingPath[i] in current)) {
-				current[remainingPath[i]] = {};
+					// Only add characters if we're still inside the main parentheses
+					if (parenthesesCount > 0 || char !== ')') {
+						argsString += char;
+					}
+				}
+
+				current++;
+			}
+
+			// If parentheses are balanced, parse the arguments
+			if (parenthesesCount === 0) {
+				try {
+					const parsedArgs = this.parseArguments(argsString);
+					args.push(parsedArgs);
+				} catch (error) {
+					// If parsing fails, throw an ApplicationError with details
+					throw new NodeOperationError(
+						this.ctx.getNode(),
+						`Failed to parse $fromAI arguments: ${argsString}: ${error}`,
+					);
+				}
+			} else {
+				// Log an error if parentheses are unbalanced
+				throw new NodeOperationError(
+					this.ctx.getNode(),
+					`Unbalanced parentheses while parsing $fromAI call: ${str.slice(startIndex)}`,
+				);
 			}
-			current = current[remainingPath[i]] as Record<string, unknown>;
 		}
 
-		// Set the value at the deepest level
-		const lastKey = remainingPath[remainingPath.length - 1];
-		current[lastKey ?? matchingKey] = values[matchingKey];
+		return args;
 	}
 
-	// If no nested structure was created, return the direct value
-	return Object.keys(result).length === 0 ? values[encodeDotNotation(baseKey)] : result;
+	/**
+	 * Parses the arguments of a single $fromAI function call.
+	 * @param argsString The string containing the function arguments.
+	 * @returns A FromAIArgument object.
+	 */
+	private parseArguments(argsString: string): FromAIArgument {
+		// Split arguments by commas not inside quotes
+		const args: string[] = [];
+		let currentArg = '';
+		let inQuotes = false;
+		let quoteChar = '';
+		let escapeNext = false;
+
+		for (let i = 0; i < argsString.length; i++) {
+			const char = argsString[i];
+
+			if (escapeNext) {
+				currentArg += char;
+				escapeNext = false;
+				continue;
+			}
+
+			if (char === '\\') {
+				escapeNext = true;
+				continue;
+			}
+
+			if (['"', "'", '`'].includes(char)) {
+				if (!inQuotes) {
+					inQuotes = true;
+					quoteChar = char;
+					currentArg += char;
+				} else if (char === quoteChar) {
+					inQuotes = false;
+					quoteChar = '';
+					currentArg += char;
+				} else {
+					currentArg += char;
+				}
+				continue;
+			}
+
+			if (char === ',' && !inQuotes) {
+				args.push(currentArg.trim());
+				currentArg = '';
+				continue;
+			}
+
+			currentArg += char;
+		}
+
+		if (currentArg) {
+			args.push(currentArg.trim());
+		}
+
+		// Remove surrounding quotes if present
+		const cleanArgs = args.map((arg) => {
+			const trimmed = arg.trim();
+			if (
+				(trimmed.startsWith("'") && trimmed.endsWith("'")) ||
+				(trimmed.startsWith('`') && trimmed.endsWith('`')) ||
+				(trimmed.startsWith('"') && trimmed.endsWith('"'))
+			) {
+				return trimmed
+					.slice(1, -1)
+					.replace(/\\'/g, "'")
+					.replace(/\\`/g, '`')
+					.replace(/\\"/g, '"')
+					.replace(/\\\\/g, '\\');
+			}
+			return trimmed;
+		});
+
+		const type = cleanArgs?.[2] || 'string';
+
+		if (!['string', 'number', 'boolean', 'json'].includes(type.toLowerCase())) {
+			throw new NodeOperationError(this.ctx.getNode(), `Invalid type: ${type}`);
+		}
+
+		return {
+			key: cleanArgs[0] || '',
+			description: cleanArgs[1],
+			type: (cleanArgs?.[2] ?? 'string') as AllowedTypes,
+			defaultValue: this.parseDefaultValue(cleanArgs[3]),
+		};
+	}
+
+	/**
+	 * Parses the default value, preserving its original type.
+	 * @param value The default value as a string.
+	 * @returns The parsed default value in its appropriate type.
+	 */
+	private parseDefaultValue(
+		value: string | undefined,
+	): string | number | boolean | Record<string, unknown> | undefined {
+		if (value === undefined || value === '') return undefined;
+		const lowerValue = value.toLowerCase();
+		if (lowerValue === 'true') return true;
+		if (lowerValue === 'false') return false;
+		if (!isNaN(Number(value))) return Number(value);
+		try {
+			return jsonParse(value);
+		} catch {
+			return value;
+		}
+	}
+
+	/**
+	 * Generates a description for a node based on the provided parameters.
+	 * @param node The node type.
+	 * @param nodeParameters The parameters of the node.
+	 * @returns A string description for the node.
+	 */
+	private getDescription(node: INodeType, nodeParameters: INodeParameters): string {
+		const manualDescription = nodeParameters.toolDescription as string;
+
+		if (nodeParameters.descriptionType === 'auto') {
+			const resource = nodeParameters.resource as string;
+			const operation = nodeParameters.operation as string;
+			let description = node.description.description;
+			if (resource) {
+				description += `\n Resource: ${resource}`;
+			}
+			if (operation) {
+				description += `\n Operation: ${operation}`;
+			}
+			return description.trim();
+		}
+		if (nodeParameters.descriptionType === 'manual') {
+			return manualDescription ?? node.description.description;
+		}
+
+		return node.description.description;
+	}
+
+	/**
+	 * Creates a DynamicStructuredTool from a node.
+	 * @param node The node type.
+	 * @param nodeParameters The parameters of the node.
+	 * @returns A DynamicStructuredTool instance.
+	 */
+	public createTool(node: INodeType, nodeParameters: INodeParameters): DynamicStructuredTool {
+		const collectedArguments: FromAIArgument[] = [];
+		this.traverseNodeParameters(nodeParameters, collectedArguments);
+
+		// Validate each collected argument
+		const nameValidationRegex = /^[a-zA-Z0-9_-]{1,64}$/;
+		const keyMap = new Map<string, FromAIArgument>();
+		for (const argument of collectedArguments) {
+			if (argument.key.length === 0 || !nameValidationRegex.test(argument.key)) {
+				const isEmptyError = 'You must specify a key when using $fromAI()';
+				const isInvalidError = `Parameter key \`${argument.key}\` is invalid`;
+				const error = new Error(argument.key.length === 0 ? isEmptyError : isInvalidError);
+				throw new NodeOperationError(this.ctx.getNode(), error, {
+					description:
+						'Invalid parameter key, must be between 1 and 64 characters long and only contain letters, numbers, underscores, and hyphens',
+				});
+			}
+
+			if (keyMap.has(argument.key)) {
+				// If the key already exists in the Map
+				const existingArg = keyMap.get(argument.key)!;
+
+				// Check if the existing argument has the same description and type
+				if (
+					existingArg.description !== argument.description ||
+					existingArg.type !== argument.type
+				) {
+					// If not, throw an error for inconsistent duplicate keys
+					throw new NodeOperationError(
+						this.ctx.getNode(),
+						`Duplicate key '${argument.key}' found with different description or type`,
+						{
+							description:
+								'Ensure all $fromAI() calls with the same key have consistent descriptions and types',
+						},
+					);
+				}
+				// If the duplicate key has consistent description and type, it's allowed (no action needed)
+			} else {
+				// If the key doesn't exist in the Map, add it
+				keyMap.set(argument.key, argument);
+			}
+		}
+
+		// Remove duplicate keys, latest occurrence takes precedence
+		const uniqueArgsMap = collectedArguments.reduce((map, arg) => {
+			map.set(arg.key, arg);
+			return map;
+		}, new Map<string, FromAIArgument>());
+
+		const uniqueArguments = Array.from(uniqueArgsMap.values());
+
+		// Generate Zod schema from unique arguments
+		const schemaObj = uniqueArguments.reduce((acc: Record<string, z.ZodTypeAny>, placeholder) => {
+			acc[placeholder.key] = this.generateZodSchema(placeholder);
+			return acc;
+		}, {});
+
+		const schema = z.object(schemaObj).required();
+		const description = this.getDescription(node, nodeParameters);
+		const nodeName = this.ctx.getNode().name.replace(/ /g, '_');
+		const name = nodeName || node.description.name;
+
+		const tool = new DynamicStructuredTool({
+			name,
+			description,
+			schema,
+			func: async (functionArgs: z.infer<typeof schema>) => {
+				const { index } = this.ctx.addInputData(NodeConnectionType.AiTool, [
+					[{ json: functionArgs }],
+				]);
+
+				try {
+					// Execute the node with the proxied context
+					const result = await node.execute?.bind(this.ctx)();
+
+					// Process and map the results
+					const mappedResults = result?.[0]?.flatMap((item) => item.json);
+
+					// Add output data to the context
+					this.ctx.addOutputData(NodeConnectionType.AiTool, index, [
+						[{ json: { response: mappedResults } }],
+					]);
+
+					// Return the stringified results
+					return JSON.stringify(mappedResults);
+				} catch (error) {
+					const nodeError = new NodeOperationError(this.ctx.getNode(), error as Error);
+					this.ctx.addOutputData(NodeConnectionType.AiTool, index, nodeError);
+					return 'Error during node execution: ' + nodeError.description;
+				}
+			},
+		});
+
+		return tool;
+	}
 }
 
 /**
- * Extracts the description from a placeholder string.
- * @param {string} value - The placeholder string.
- * @returns {string} The extracted description or a default message.
- */
-function extractPlaceholderDescription(value: string): string {
-	const match = value.match(/{{ '__PLACEHOLDER:\s*(.+?)\s*' }}/);
-	return match ? match[1] : 'No description provided';
-}
-
-/**
- * Creates a DynamicStructuredTool from an n8n node.
- * @param {INodeType} node - The n8n node to convert.
- * @param {IExecuteFunctions} ctx - The execution context.
- * @param {INodeParameters} nodeParameters - The node parameters.
- * @returns {DynamicStructuredTool} The created tool.
+ * Converts node into LangChain tool by analyzing node parameters,
+ * identifying placeholders using the $fromAI function, and generating a Zod schema. It then creates
+ * a DynamicStructuredTool that can be used in LangChain workflows.
+ *
+ * @param ctx The execution context.
+ * @param node The node type.
+ * @param nodeParameters The parameters of the node.
+ * @returns An object containing the DynamicStructuredTool instance.
  */
 export function createNodeAsTool(
-	node: INodeType,
-	ctx: IExecuteFunctions,
-	nodeParameters: INodeParameters,
-): DynamicStructuredTool {
-	// Find all placeholder values in the node parameters
-	const placeholderValues = traverseObject(nodeParameters);
-
-	// Generate Zod schema from placeholder values
-	const schemaObj: { [key: string]: z.ZodString } = {};
-	for (const [key, value] of placeholderValues.entries()) {
-		const description = extractPlaceholderDescription(value);
-		schemaObj[key] = z.string().describe(description);
-	}
-	const schema = z.object(schemaObj).required();
-
-	// Get the tool description from node parameters or use the default
-	const toolDescription = ctx.getNodeParameter(
-		'toolDescription',
-		0,
-		node.description.description,
-	) as string;
-	type GetNodeParameterMethod = IExecuteFunctions['getNodeParameter'];
-
-	const tool = new DynamicStructuredTool({
-		name: node.description.name,
-		description: toolDescription ? toolDescription : node.description.description,
-		schema,
-		func: async (functionArgs: z.infer<typeof schema>) => {
-			// Create a proxy for ctx to soft-override parameters with values from the LLM
-			const ctxProxy = new Proxy(ctx, {
-				get(target: IExecuteFunctions, prop: string | symbol, receiver: unknown) {
-					if (prop === 'getNodeParameter') {
-						// Override getNodeParameter method
-						// eslint-disable-next-line @typescript-eslint/unbound-method
-						return new Proxy(target.getNodeParameter, {
-							apply(
-								targetMethod: GetNodeParameterMethod,
-								thisArg: unknown,
-								argumentsList: Parameters<GetNodeParameterMethod>,
-							): ReturnType<GetNodeParameterMethod> {
-								const [key] = argumentsList;
-								if (typeof key !== 'string') {
-									// If key is not a string, use the original method
-									return Reflect.apply(targetMethod, thisArg, argumentsList);
-								}
-
-								const encodedKey = encodeDotNotation(key);
-								// Check if the full key or any more specific key is a placeholder
-								const matchingKeys = Array.from(placeholderValues.keys()).filter((k) =>
-									k.startsWith(encodedKey),
-								);
-
-								if (matchingKeys.length > 0) {
-									// If there are matching keys, build the structure using args
-									const res = buildStructureFromMatches(encodedKey, matchingKeys, functionArgs);
-									// Return either the specific value or the entire built structure
-									return res?.[decodeDotNotation(key)] ?? res;
-								}
-
-								// If no placeholder is found, use the original function
-								return Reflect.apply(targetMethod, thisArg, argumentsList);
-							},
-						});
-					}
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-					return Reflect.get(target, prop, receiver);
-				},
-			});
-
-			// Add input data to the context
-			ctxProxy.addInputData(NodeConnectionType.AiTool, [[{ json: functionArgs }]]);
-
-			// Execute the node with the proxied context
-			const result = await node.execute?.bind(ctxProxy)();
-
-			// Process and map the results
-			const mappedResults = result?.[0]?.flatMap((item) => item.json);
-
-			// Add output data to the context
-			ctxProxy.addOutputData(NodeConnectionType.AiTool, 0, [
-				[{ json: { response: mappedResults } }],
-			]);
-
-			// Return the stringified results
-			return JSON.stringify(mappedResults);
-		},
-	});
-
-	return tool;
-}
-
-/**
- * Asynchronously creates a DynamicStructuredTool from an n8n node.
- * @param {IExecuteFunctions} ctx - The execution context.
- * @param {INodeType} node - The n8n node to convert.
- * @param {INodeParameters} nodeParameters - The node parameters.
- * @returns {Promise<{response: DynamicStructuredTool}>} A promise that resolves to an object containing the created tool.
- */
-export function getNodeAsTool(
 	ctx: IExecuteFunctions,
 	node: INodeType,
 	nodeParameters: INodeParameters,
 ) {
+	const parser = new AIParametersParser(ctx);
+
 	return {
-		response: createNodeAsTool(node, ctx, nodeParameters),
+		response: parser.createTool(node, nodeParameters),
 	};
 }
diff --git a/packages/core/src/Credentials.ts b/packages/core/src/Credentials.ts
index 3210703a27..da6deb742c 100644
--- a/packages/core/src/Credentials.ts
+++ b/packages/core/src/Credentials.ts
@@ -1,6 +1,7 @@
-import { Container } from 'typedi';
 import type { ICredentialDataDecryptedObject, ICredentialsEncrypted } from 'n8n-workflow';
 import { ApplicationError, ICredentials, jsonParse } from 'n8n-workflow';
+import { Container } from 'typedi';
+
 import { Cipher } from './Cipher';
 
 export class Credentials<
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 717edd5359..a1401a8fb5 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -1,5 +1,4 @@
 import glob from 'fast-glob';
-import { readFile } from 'fs/promises';
 import type {
 	CodexData,
 	DocumentationLink,
@@ -20,7 +19,10 @@ import {
 	getVersionedNodeTypeAll,
 	jsonParse,
 } from 'n8n-workflow';
+import { readFileSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
 import * as path from 'path';
+
 import { loadClassInIsolation } from './ClassLoader';
 import { CUSTOM_NODES_CATEGORY } from './Constants';
 import type { n8n } from './Interfaces';
@@ -350,18 +352,11 @@ export class CustomDirectoryLoader extends DirectoryLoader {
  * e.g. /nodes-base or community packages.
  */
 export class PackageDirectoryLoader extends DirectoryLoader {
-	packageName = '';
+	packageJson: n8n.PackageJson = this.readJSONSync('package.json');
 
-	packageJson!: n8n.PackageJson;
-
-	async readPackageJson() {
-		this.packageJson = await this.readJSON('package.json');
-		this.packageName = this.packageJson.name;
-	}
+	packageName = this.packageJson.name;
 
 	override async loadAll() {
-		await this.readPackageJson();
-
 		const { n8n } = this.packageJson;
 		if (!n8n) return;
 
@@ -391,6 +386,17 @@ export class PackageDirectoryLoader extends DirectoryLoader {
 		});
 	}
 
+	protected readJSONSync<T>(file: string): T {
+		const filePath = this.resolvePath(file);
+		const fileString = readFileSync(filePath, 'utf8');
+
+		try {
+			return jsonParse<T>(fileString);
+		} catch (error) {
+			throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
+		}
+	}
+
 	protected async readJSON<T>(file: string): Promise<T> {
 		const filePath = this.resolvePath(file);
 		const fileString = await readFile(filePath, 'utf8');
@@ -408,8 +414,6 @@ export class PackageDirectoryLoader extends DirectoryLoader {
  */
 export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
 	override async loadAll() {
-		await this.readPackageJson();
-
 		try {
 			const knownNodes: typeof this.known.nodes = await this.readJSON('dist/known/nodes.json');
 			for (const nodeName in knownNodes) {
diff --git a/packages/core/src/ExecutionMetadata.ts b/packages/core/src/ExecutionMetadata.ts
index cc2743a56f..8466933e05 100644
--- a/packages/core/src/ExecutionMetadata.ts
+++ b/packages/core/src/ExecutionMetadata.ts
@@ -1,5 +1,6 @@
 import type { IRunExecutionData } from 'n8n-workflow';
 import { LoggerProxy as Logger } from 'n8n-workflow';
+
 import { InvalidExecutionMetadataError } from './errors/invalid-execution-metadata.error';
 
 export const KV_LIMIT = 10;
diff --git a/packages/core/src/InstanceSettings.ts b/packages/core/src/InstanceSettings.ts
index 44f4b0c336..17ccf15def 100644
--- a/packages/core/src/InstanceSettings.ts
+++ b/packages/core/src/InstanceSettings.ts
@@ -1,8 +1,8 @@
-import path from 'path';
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { createHash, randomBytes } from 'crypto';
-import { Service } from 'typedi';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
+import path from 'path';
+import { Service } from 'typedi';
 
 interface ReadOnlySettings {
 	encryptionKey: string;
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 0d37dde2b3..6cbef1e1b8 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -32,6 +32,7 @@ import { IncomingMessage, type IncomingHttpHeaders } from 'http';
 import { Agent, type AgentOptions } from 'https';
 import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
+import merge from 'lodash/merge';
 import pick from 'lodash/pick';
 import { DateTime } from 'luxon';
 import { extension, lookup } from 'mime-types';
@@ -101,6 +102,13 @@ import type {
 	EnsureTypeOptions,
 	SSHTunnelFunctions,
 	SchedulingFunctions,
+	DeduplicationHelperFunctions,
+	IDeduplicationOutput,
+	IDeduplicationOutputItems,
+	ICheckProcessedOptions,
+	DeduplicationScope,
+	DeduplicationItemTypes,
+	ICheckProcessedContextData,
 	AiEvent,
 } from 'n8n-workflow';
 import {
@@ -128,9 +136,13 @@ import clientOAuth1 from 'oauth-1.0a';
 import path from 'path';
 import { stringify } from 'qs';
 import { Readable } from 'stream';
+import Container from 'typedi';
 import url, { URL, URLSearchParams } from 'url';
 
+import { createAgentStartJob } from './Agent';
 import { BinaryDataService } from './BinaryData/BinaryData.service';
+import type { BinaryData } from './BinaryData/types';
+import { binaryToBuffer } from './BinaryData/utils';
 import {
 	BINARY_DATA_STORAGE_PATH,
 	BLOCK_FILE_ACCESS_TO_N8N_FILES,
@@ -143,23 +155,20 @@ import {
 	UM_EMAIL_TEMPLATES_INVITE,
 	UM_EMAIL_TEMPLATES_PWRESET,
 } from './Constants';
-import { extractValue } from './ExtractValue';
-import type { ExtendedValidationResult, IResponseError } from './Interfaces';
+import { createNodeAsTool } from './CreateNodeAsTool';
+import { DataDeduplicationService } from './data-deduplication-service';
 import {
 	getAllWorkflowExecutionMetadata,
 	getWorkflowExecutionMetadata,
 	setAllWorkflowExecutionMetadata,
 	setWorkflowExecutionMetadata,
 } from './ExecutionMetadata';
-import { getSecretsProxy } from './Secrets';
-import Container from 'typedi';
-import type { BinaryData } from './BinaryData/types';
-import merge from 'lodash/merge';
+import { extractValue } from './ExtractValue';
 import { InstanceSettings } from './InstanceSettings';
+import type { ExtendedValidationResult, IResponseError } from './Interfaces';
 import { ScheduledTaskManager } from './ScheduledTaskManager';
+import { getSecretsProxy } from './Secrets';
 import { SSHClientsManager } from './SSHClientsManager';
-import { binaryToBuffer } from './BinaryData/utils';
-import { getNodeAsTool } from './CreateNodeAsTool';
 
 axios.defaults.timeout = 300000;
 // Prevent axios from adding x-form-www-urlencoded headers by default
@@ -1283,6 +1292,72 @@ async function prepareBinaryData(
 	return await setBinaryDataBuffer(returnData, binaryData, workflowId, executionId);
 }
 
+export async function checkProcessedAndRecord(
+	items: DeduplicationItemTypes[],
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<IDeduplicationOutput> {
+	return await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+		items,
+		scope,
+		contextData,
+		options,
+	);
+}
+
+export async function checkProcessedItemsAndRecord(
+	key: string,
+	items: IDataObject[],
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<IDeduplicationOutputItems> {
+	return await DataDeduplicationService.getInstance().checkProcessedItemsAndRecord(
+		key,
+		items,
+		scope,
+		contextData,
+		options,
+	);
+}
+
+export async function removeProcessed(
+	items: DeduplicationItemTypes[],
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<void> {
+	return await DataDeduplicationService.getInstance().removeProcessed(
+		items,
+		scope,
+		contextData,
+		options,
+	);
+}
+
+export async function clearAllProcessedItems(
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<void> {
+	return await DataDeduplicationService.getInstance().clearAllProcessedItems(
+		scope,
+		contextData,
+		options,
+	);
+}
+export async function getProcessedDataCount(
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<number> {
+	return await DataDeduplicationService.getInstance().getProcessedDataCount(
+		scope,
+		contextData,
+		options,
+	);
+}
 function applyPaginationRequestData(
 	requestData: IRequestOptions,
 	paginationRequestData: PaginationOptions['request'],
@@ -2851,7 +2926,7 @@ async function getInputConnectionData(
 			if (!nodeType.supplyData) {
 				if (nodeType.description.outputs.includes(NodeConnectionType.AiTool)) {
 					nodeType.supplyData = async function (this: IExecuteFunctions) {
-						return getNodeAsTool(this, nodeType, this.getNode().parameters);
+						return createNodeAsTool(this, nodeType, this.getNode().parameters);
 					};
 				} else {
 					throw new ApplicationError('Node does not have a `supplyData` method defined', {
@@ -3452,6 +3527,52 @@ const getBinaryHelperFunctions = (
 	},
 });
 
+const getCheckProcessedHelperFunctions = (
+	workflow: Workflow,
+	node: INode,
+): DeduplicationHelperFunctions => ({
+	async checkProcessedAndRecord(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutput> {
+		return await checkProcessedAndRecord(items, scope, { node, workflow }, options);
+	},
+	async checkProcessedItemsAndRecord(
+		propertyName: string,
+		items: IDataObject[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutputItems> {
+		return await checkProcessedItemsAndRecord(
+			propertyName,
+			items,
+			scope,
+			{ node, workflow },
+			options,
+		);
+	},
+	async removeProcessed(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<void> {
+		return await removeProcessed(items, scope, { node, workflow }, options);
+	},
+	async clearAllProcessedItems(
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<void> {
+		return await clearAllProcessedItems(scope, { node, workflow }, options);
+	},
+	async getProcessedDataCount(
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<number> {
+		return await getProcessedDataCount(scope, { node, workflow }, options);
+	},
+});
+
 /**
  * Returns a copy of the items which only contains the json data and
  * of that only the defined properties
@@ -3788,6 +3909,17 @@ export function getExecuteFunctions(
 					additionalData.setExecutionStatus('waiting');
 				}
 			},
+			logNodeOutput(...args: unknown[]): void {
+				if (mode === 'manual') {
+					// @ts-expect-error `args` is spreadable
+					this.sendMessageToUI(...args);
+					return;
+				}
+
+				if (process.env.CODE_ENABLE_STDOUT === 'true') {
+					console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args);
+				}
+			},
 			sendMessageToUI(...args: any[]): void {
 				if (mode !== 'manual') {
 					return;
@@ -3884,6 +4016,7 @@ export function getExecuteFunctions(
 				...getSSHTunnelFunctions(),
 				...getFileSystemHelperFunctions(node),
 				...getBinaryHelperFunctions(additionalData, workflow.id),
+				...getCheckProcessedHelperFunctions(workflow, node),
 				assertBinaryData: (itemIndex, propertyName) =>
 					assertBinaryData(inputData, node, itemIndex, propertyName, 0),
 				getBinaryDataBuffer: async (itemIndex, propertyName) =>
@@ -3905,6 +4038,19 @@ export function getExecuteFunctions(
 				});
 			},
 			getParentCallbackManager: () => additionalData.parentCallbackManager,
+			startJob: createAgentStartJob(
+				additionalData,
+				inputData,
+				node,
+				workflow,
+				runExecutionData,
+				runIndex,
+				node.name,
+				connectionInputData,
+				{},
+				mode,
+				executeData,
+			),
 		};
 	})(workflow, runExecutionData, connectionInputData, inputData, node) as IExecuteFunctions;
 }
diff --git a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts b/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
index ddd21db799..0e4d8463df 100644
--- a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
+++ b/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
@@ -1,12 +1,12 @@
-import { createHash } from 'node:crypto';
-import axios from 'axios';
-import { Service } from 'typedi';
 import { sign } from 'aws4';
-import { isStream, parseXml, writeBlockedMessage } from './utils';
-import { ApplicationError, LoggerProxy as Logger } from 'n8n-workflow';
-
-import type { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig, Method } from 'axios';
 import type { Request as Aws4Options, Credentials as Aws4Credentials } from 'aws4';
+import axios from 'axios';
+import type { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig, Method } from 'axios';
+import { ApplicationError, LoggerProxy as Logger } from 'n8n-workflow';
+import { createHash } from 'node:crypto';
+import type { Readable } from 'stream';
+import { Service } from 'typedi';
+
 import type {
 	Bucket,
 	ConfigSchemaCredentials,
@@ -15,7 +15,7 @@ import type {
 	RawListPage,
 	RequestOptions,
 } from './types';
-import type { Readable } from 'stream';
+import { isStream, parseXml, writeBlockedMessage } from './utils';
 import type { BinaryData } from '../BinaryData/types';
 
 @Service()
diff --git a/packages/core/src/ObjectStore/types.ts b/packages/core/src/ObjectStore/types.ts
index 639ae2e6a2..d0b7ab0713 100644
--- a/packages/core/src/ObjectStore/types.ts
+++ b/packages/core/src/ObjectStore/types.ts
@@ -1,4 +1,5 @@
 import type { AxiosResponseHeaders, ResponseType } from 'axios';
+
 import type { BinaryData } from '../BinaryData/types';
 
 export type RawListPage = {
diff --git a/packages/core/src/PartialExecutionUtils/DirectedGraph.ts b/packages/core/src/PartialExecutionUtils/DirectedGraph.ts
index bd6cf81a2f..606f624d02 100644
--- a/packages/core/src/PartialExecutionUtils/DirectedGraph.ts
+++ b/packages/core/src/PartialExecutionUtils/DirectedGraph.ts
@@ -12,6 +12,11 @@ export type GraphConnection = {
 // fromName-outputType-outputIndex-inputIndex-toName
 type DirectedGraphKey = `${string}-${NodeConnectionType}-${number}-${number}-${string}`;
 
+type RemoveNodeBaseOptions = {
+	reconnectConnections: boolean;
+	skipConnectionFn?: (connection: GraphConnection) => boolean;
+};
+
 /**
  * Represents a directed graph as an adjacency list, e.g. one list for the
  * vertices and one list for the edges.
@@ -67,6 +72,80 @@ export class DirectedGraph {
 		return this;
 	}
 
+	/**
+	 * Removes a node from the graph.
+	 *
+	 * By default it will also remove all connections that use that node and
+	 * return nothing.
+	 *
+	 * If you pass `{ reconnectConnections: true }` it will rewire all
+	 * connections making sure all parent nodes are connected to all child nodes
+	 * and return the new connections.
+	 */
+	removeNode(
+		node: INode,
+		options?: { reconnectConnections: true } & RemoveNodeBaseOptions,
+	): GraphConnection[];
+	removeNode(
+		node: INode,
+		options?: { reconnectConnections: false } & RemoveNodeBaseOptions,
+	): undefined;
+	removeNode(
+		node: INode,
+		options: RemoveNodeBaseOptions = { reconnectConnections: false },
+	): undefined | GraphConnection[] {
+		if (options.reconnectConnections) {
+			const incomingConnections = this.getDirectParentConnections(node);
+			const outgoingConnections = this.getDirectChildConnections(node);
+
+			const newConnections: GraphConnection[] = [];
+
+			for (const incomingConnection of incomingConnections) {
+				if (options.skipConnectionFn && options.skipConnectionFn(incomingConnection)) {
+					continue;
+				}
+
+				for (const outgoingConnection of outgoingConnections) {
+					if (options.skipConnectionFn && options.skipConnectionFn(outgoingConnection)) {
+						continue;
+					}
+
+					const newConnection = {
+						...incomingConnection,
+						to: outgoingConnection.to,
+						inputIndex: outgoingConnection.inputIndex,
+					};
+
+					newConnections.push(newConnection);
+				}
+			}
+
+			for (const [key, connection] of this.connections.entries()) {
+				if (connection.to === node || connection.from === node) {
+					this.connections.delete(key);
+				}
+			}
+
+			for (const newConnection of newConnections) {
+				this.connections.set(this.makeKey(newConnection), newConnection);
+			}
+
+			this.nodes.delete(node.name);
+
+			return newConnections;
+		} else {
+			for (const [key, connection] of this.connections.entries()) {
+				if (connection.to === node || connection.from === node) {
+					this.connections.delete(key);
+				}
+			}
+
+			this.nodes.delete(node.name);
+
+			return;
+		}
+	}
+
 	addConnection(connectionInput: {
 		from: INode;
 		to: INode;
@@ -108,7 +187,7 @@ export class DirectedGraph {
 		return this;
 	}
 
-	getDirectChildren(node: INode) {
+	getDirectChildConnections(node: INode) {
 		const nodeExists = this.nodes.get(node.name) === node;
 		a.ok(nodeExists);
 
@@ -126,7 +205,7 @@ export class DirectedGraph {
 	}
 
 	private getChildrenRecursive(node: INode, children: Set<INode>) {
-		const directChildren = this.getDirectChildren(node);
+		const directChildren = this.getDirectChildConnections(node);
 
 		for (const directChild of directChildren) {
 			// Break out if we found a cycle.
@@ -145,13 +224,13 @@ export class DirectedGraph {
 	 * argument.
 	 *
 	 * If the node being passed in is a child of itself (e.g. is part of a
-	 * cylce), the return set will contain it as well.
+	 * cycle), the return set will contain it as well.
 	 */
 	getChildren(node: INode) {
 		return this.getChildrenRecursive(node, new Set());
 	}
 
-	getDirectParents(node: INode) {
+	getDirectParentConnections(node: INode) {
 		const nodeExists = this.nodes.get(node.name) === node;
 		a.ok(nodeExists);
 
@@ -168,6 +247,27 @@ export class DirectedGraph {
 		return directParents;
 	}
 
+	private getParentConnectionsRecursive(node: INode, connections: Set<GraphConnection>) {
+		const parentConnections = this.getDirectParentConnections(node);
+
+		for (const connection of parentConnections) {
+			// break out of cycles
+			if (connections.has(connection)) {
+				continue;
+			}
+
+			connections.add(connection);
+
+			this.getParentConnectionsRecursive(connection.from, connections);
+		}
+
+		return connections;
+	}
+
+	getParentConnections(node: INode) {
+		return this.getParentConnectionsRecursive(node, new Set());
+	}
+
 	getConnection(
 		from: INode,
 		outputIndex: number,
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts
index 93df23de32..d6eedf416d 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts
@@ -9,8 +9,10 @@
 // XX denotes that the node is disabled
 // PD denotes that the node has pinned data
 
-import { DirectedGraph } from '../DirectedGraph';
+import { NodeConnectionType } from 'n8n-workflow';
+
 import { createNodeData, defaultWorkflowParameter } from './helpers';
+import { DirectedGraph } from '../DirectedGraph';
 
 describe('DirectedGraph', () => {
 	//     ┌─────┐    ┌─────┐   ┌─────┐
@@ -86,4 +88,256 @@ describe('DirectedGraph', () => {
 			expect(children).toEqual(new Set([node1, node2, node3]));
 		});
 	});
+
+	describe('getParentConnections', () => {
+		// ┌─────┐   ┌─────┐   ┌─────┐   ┌─────┐
+		// │node1├──►│node2├──►│node3│──►│node4│
+		// └─────┘   └─────┘   └─────┘   └─────┘
+		test('returns all parent connections', () => {
+			// ARRANGE
+			const node1 = createNodeData({ name: 'Node1' });
+			const node2 = createNodeData({ name: 'Node2' });
+			const node3 = createNodeData({ name: 'Node3' });
+			const node4 = createNodeData({ name: 'Node4' });
+			const graph = new DirectedGraph()
+				.addNodes(node1, node2, node3, node4)
+				.addConnections(
+					{ from: node1, to: node2 },
+					{ from: node2, to: node3 },
+					{ from: node3, to: node4 },
+				);
+
+			// ACT
+			const connections = graph.getParentConnections(node3);
+
+			// ASSERT
+			const expectedConnections = graph.getConnections().filter((c) => c.to !== node4);
+			expect(connections.size).toBe(2);
+			expect(connections).toEqual(new Set(expectedConnections));
+		});
+
+		//     ┌─────┐    ┌─────┐   ┌─────┐
+		//  ┌─►│node1├───►│node2├──►│node3├─┐
+		//  │  └─────┘    └─────┘   └─────┘ │
+		//  │                               │
+		//  └───────────────────────────────┘
+		test('terminates when finding a cycle', () => {
+			// ARRANGE
+			const node1 = createNodeData({ name: 'Node1' });
+			const node2 = createNodeData({ name: 'Node2' });
+			const node3 = createNodeData({ name: 'Node3' });
+			const graph = new DirectedGraph()
+				.addNodes(node1, node2, node3)
+				.addConnections(
+					{ from: node1, to: node2 },
+					{ from: node2, to: node3 },
+					{ from: node3, to: node1 },
+				);
+
+			// ACT
+			const connections = graph.getParentConnections(node3);
+
+			// ASSERT
+			expect(connections.size).toBe(3);
+			expect(connections).toEqual(new Set(graph.getConnections()));
+		});
+	});
+
+	describe('removeNode', () => {
+		//              XX
+		//  ┌─────┐    ┌─────┐   ┌─────┐
+		//  │node0├───►│node1├──►│node2│
+		//  └─────┘    └─────┘   └─────┘
+		// turns into
+		//  ┌─────┐              ┌─────┐
+		//  │node0│              │node2│
+		//  └─────┘              └─────┘
+		test('remove node and all connections', () => {
+			// ARRANGE
+			const node0 = createNodeData({ name: 'node0' });
+			const node1 = createNodeData({ name: 'node1' });
+			const node2 = createNodeData({ name: 'node2' });
+			const graph = new DirectedGraph()
+				.addNodes(node0, node1, node2)
+				.addConnections({ from: node0, to: node1 }, { from: node0, to: node2 });
+
+			// ACT
+			graph.removeNode(node1);
+
+			// ASSERT
+			expect(graph).toEqual(
+				new DirectedGraph().addNodes(node0, node2).addConnections({ from: node0, to: node2 }),
+			);
+		});
+
+		//              XX
+		//  ┌─────┐    ┌─────┐   ┌─────┐
+		//  │node0├───►│node1├──►│node2│
+		//  └─────┘    └─────┘   └─────┘
+		// turns into
+		//  ┌─────┐   ┌─────┐
+		//  │node0├──►│node2│
+		//  └─────┘   └─────┘
+		test('remove node, but reconnect connections', () => {
+			// ARRANGE
+			const node0 = createNodeData({ name: 'node0' });
+			const node1 = createNodeData({ name: 'node1' });
+			const node2 = createNodeData({ name: 'node2' });
+			const graph = new DirectedGraph()
+				.addNodes(node0, node1, node2)
+				.addConnections({ from: node0, to: node1 }, { from: node1, to: node2 });
+
+			// ACT
+			const newConnections = graph.removeNode(node1, { reconnectConnections: true });
+
+			// ASSERT
+			expect(newConnections).toHaveLength(1);
+			expect(newConnections[0]).toEqual({
+				from: node0,
+				outputIndex: 0,
+				type: NodeConnectionType.Main,
+				inputIndex: 0,
+				to: node2,
+			});
+			expect(graph).toEqual(
+				new DirectedGraph().addNodes(node0, node2).addConnections({ from: node0, to: node2 }),
+			);
+		});
+
+		//               XX
+		//  ┌─────┐     ┌─────┐     ┌─────┐
+		//  │     │o   o│     │o   o│     │
+		//  │     │o─┐ o│     │o   o│     │
+		//  │node0│o └►o│node1│o   o│node2│
+		//  │     │o   o│     │o─┐ o│     │
+		//  │     │o   o│     │o └►o│     │
+		//  └─────┘     └─────┘     └─────┘
+		// turns into
+		//  ┌─────┐                 ┌─────┐
+		//  │     │o               o│     │
+		//  │     │o───────┐       o│     │
+		//  │node0│o       │       o│node2│
+		//  │     │o       │       o│     │
+		//  │     │o       └──────►o│     │
+		//  └─────┘                 └─────┘
+		test('remove node, reconnect connections and retaining the input indexes', () => {
+			// ARRANGE
+			const node0 = createNodeData({ name: 'node0' });
+			const node1 = createNodeData({ name: 'node1' });
+			const node2 = createNodeData({ name: 'node2' });
+			const graph = new DirectedGraph()
+				.addNodes(node0, node1, node2)
+				.addConnections(
+					{ from: node0, outputIndex: 1, inputIndex: 2, to: node1 },
+					{ from: node1, outputIndex: 3, inputIndex: 4, to: node2 },
+				);
+
+			// ACT
+			const newConnections = graph.removeNode(node1, { reconnectConnections: true });
+
+			// ASSERT
+			expect(newConnections).toHaveLength(1);
+			expect(newConnections[0]).toEqual({
+				from: node0,
+				outputIndex: 1,
+				type: NodeConnectionType.Main,
+				inputIndex: 4,
+				to: node2,
+			});
+			expect(graph).toEqual(
+				new DirectedGraph()
+					.addNodes(node0, node2)
+					.addConnections({ from: node0, outputIndex: 1, inputIndex: 4, to: node2 }),
+			);
+		});
+
+		//               XX
+		//  ┌─────┐     ┌─────┐     ┌─────┐
+		//  │     │o   o│     │o    │     │
+		//  │     │o─┐ o│     │o    │     │
+		//  │node0│  └►o│node1│o ┌►o│node2│
+		//  │     │     │     │o─┘  │     │
+		//  │     │     │     │     │     │
+		//  └─────┘     └─────┘     └─────┘
+		// turns into
+		//  ┌─────┐                 ┌─────┐
+		//  │     │o                │     │
+		//  │     │o───────┐        │     │
+		//  │node0│        └──────►o│node2│
+		//  │     │                 │     │
+		//  │     │                 │     │
+		//  └─────┘                 └─────┘
+		test('remove node, reconnect connections and retaining the input indexes, even if the child has less inputs than the than the removed node had', () => {
+			// ARRANGE
+			const node0 = createNodeData({ name: 'node0' });
+			const node1 = createNodeData({ name: 'node1' });
+			const node2 = createNodeData({ name: 'node2' });
+			const graph = new DirectedGraph()
+				.addNodes(node0, node1, node2)
+				.addConnections(
+					{ from: node0, outputIndex: 1, inputIndex: 2, to: node1 },
+					{ from: node1, outputIndex: 3, inputIndex: 0, to: node2 },
+				);
+
+			// ACT
+			const newConnections = graph.removeNode(node1, { reconnectConnections: true });
+
+			// ASSERT
+			const expectedGraph = new DirectedGraph()
+				.addNodes(node0, node2)
+				.addConnections({ from: node0, outputIndex: 1, inputIndex: 0, to: node2 });
+			expect(newConnections).toHaveLength(1);
+			expect(newConnections).toEqual(expectedGraph.getConnections());
+			expect(graph).toEqual(expectedGraph);
+		});
+
+		//  ┌─────┐                ┌──────┐
+		//  │left0├─┐   XX       ┌►│right0│
+		//  └─────┘ │  ┌──────┐  │ └──────┘
+		//          ├─►│center├──┤
+		//  ┌─────┐ │  └──────┘  │ ┌──────┐
+		//  │left1├─┘            └►│right1│
+		//  └─────┘                └──────┘
+		// turns into
+		//
+		//  ┌─────┐                ┌──────┐
+		//  │left0├─┐           ┌─►│right0│
+		//  └─────┘ │           │  └──────┘
+		//          ├───────────┤
+		//  ┌─────┐ │           │  ┌──────┐
+		//  │left1├─┘           └─►│right1│
+		//  └─────┘                └──────┘
+		test('remove node, reconnect connections and multiplexes them', () => {
+			// ARRANGE
+			const left0 = createNodeData({ name: 'left0' });
+			const left1 = createNodeData({ name: 'left1' });
+			const center = createNodeData({ name: 'center' });
+			const right0 = createNodeData({ name: 'right0' });
+			const right1 = createNodeData({ name: 'right1' });
+			const graph = new DirectedGraph()
+				.addNodes(left0, left1, center, right0, right1)
+				.addConnections(
+					{ from: left0, to: center },
+					{ from: left1, to: center },
+					{ from: center, to: right0 },
+					{ from: center, to: right1 },
+				);
+
+			// ACT
+			const newConnections = graph.removeNode(center, { reconnectConnections: true });
+
+			// ASSERT
+			const expectedGraph = new DirectedGraph()
+				.addNodes(left0, left1, right0, right1)
+				.addConnections(
+					{ from: left0, to: right0 },
+					{ from: left0, to: right1 },
+					{ from: left1, to: right0 },
+					{ from: left1, to: right1 },
+				);
+			expect(newConnections).toHaveLength(4);
+			expect(newConnections).toEqual(expectedGraph.getConnections());
+			expect(graph).toEqual(expectedGraph);
+		});
+	});
 });
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts
index fabfae0ee3..bf37ec7636 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts
@@ -1,7 +1,8 @@
 import type { IRunData } from 'n8n-workflow';
+
+import { createNodeData, toITaskData } from './helpers';
 import { cleanRunData } from '../cleanRunData';
 import { DirectedGraph } from '../DirectedGraph';
-import { createNodeData, toITaskData } from './helpers';
 
 describe('cleanRunData', () => {
 	// ┌─────┐    ┌─────┐   ┌─────┐
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
index c830833d8d..57022d862c 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
@@ -10,9 +10,10 @@
 // PD denotes that the node has pinned data
 
 import { type IPinData, type IRunData } from 'n8n-workflow';
+
 import { createNodeData, toITaskData } from './helpers';
-import { findStartNodes, isDirty } from '../findStartNodes';
 import { DirectedGraph } from '../DirectedGraph';
+import { findStartNodes, isDirty } from '../findStartNodes';
 
 describe('isDirty', () => {
 	test("if the node has pinned data it's not dirty", () => {
@@ -45,7 +46,7 @@ describe('findStartNodes', () => {
 		const node = createNodeData({ name: 'Basic Node' });
 		const graph = new DirectedGraph().addNode(node);
 
-		const startNodes = findStartNodes(graph, node, node);
+		const startNodes = findStartNodes({ graph, trigger: node, destination: node });
 
 		expect(startNodes).toHaveLength(1);
 		expect(startNodes[0]).toEqual(node);
@@ -64,7 +65,7 @@ describe('findStartNodes', () => {
 
 		// if the trigger has no run data
 		{
-			const startNodes = findStartNodes(graph, trigger, destination);
+			const startNodes = findStartNodes({ graph, trigger, destination });
 
 			expect(startNodes).toHaveLength(1);
 			expect(startNodes[0]).toEqual(trigger);
@@ -76,7 +77,7 @@ describe('findStartNodes', () => {
 				[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
 			};
 
-			const startNodes = findStartNodes(graph, trigger, destination, runData);
+			const startNodes = findStartNodes({ graph, trigger, destination, runData });
 
 			expect(startNodes).toHaveLength(1);
 			expect(startNodes[0]).toEqual(destination);
@@ -111,7 +112,7 @@ describe('findStartNodes', () => {
 		};
 
 		// ACT
-		const startNodes = findStartNodes(graph, trigger, node, runData);
+		const startNodes = findStartNodes({ graph, trigger, destination: node, runData });
 
 		// ASSERT
 		expect(startNodes).toHaveLength(1);
@@ -152,7 +153,7 @@ describe('findStartNodes', () => {
 
 		{
 			// ACT
-			const startNodes = findStartNodes(graph, trigger, node4);
+			const startNodes = findStartNodes({ graph, trigger, destination: node4 });
 
 			// ASSERT
 			expect(startNodes).toHaveLength(1);
@@ -171,7 +172,7 @@ describe('findStartNodes', () => {
 			};
 
 			// ACT
-			const startNodes = findStartNodes(graph, trigger, node4, runData);
+			const startNodes = findStartNodes({ graph, trigger, destination: node4, runData });
 
 			// ASSERT
 			expect(startNodes).toHaveLength(1);
@@ -200,8 +201,13 @@ describe('findStartNodes', () => {
 			);
 
 		// ACT
-		const startNodes = findStartNodes(graph, trigger, node, {
-			[trigger.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
+		const startNodes = findStartNodes({
+			graph,
+			trigger,
+			destination: node,
+			runData: {
+				[trigger.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
+			},
 		});
 
 		// ASSERT
@@ -230,8 +236,13 @@ describe('findStartNodes', () => {
 			);
 
 		// ACT
-		const startNodes = findStartNodes(graph, trigger, node, {
-			[trigger.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 1 }])],
+		const startNodes = findStartNodes({
+			graph,
+			trigger,
+			destination: node,
+			runData: {
+				[trigger.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 1 }])],
+			},
 		});
 
 		// ASSERT
@@ -260,13 +271,18 @@ describe('findStartNodes', () => {
 			);
 
 		// ACT
-		const startNodes = findStartNodes(graph, trigger, node, {
-			[trigger.name]: [
-				toITaskData([
-					{ data: { value: 1 }, outputIndex: 0 },
-					{ data: { value: 1 }, outputIndex: 1 },
-				]),
-			],
+		const startNodes = findStartNodes({
+			graph,
+			trigger,
+			destination: node,
+			runData: {
+				[trigger.name]: [
+					toITaskData([
+						{ data: { value: 1 }, outputIndex: 0 },
+						{ data: { value: 1 }, outputIndex: 1 },
+					]),
+				],
+			},
 		});
 
 		// ASSERT
@@ -296,10 +312,15 @@ describe('findStartNodes', () => {
 			);
 
 		// ACT
-		const startNodes = findStartNodes(graph, trigger, node3, {
-			[trigger.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
-			[node1.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
-			[node2.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
+		const startNodes = findStartNodes({
+			graph,
+			trigger,
+			destination: node3,
+			runData: {
+				[trigger.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
+				[node1.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
+				[node2.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
+			},
 		});
 
 		// ASSERT
@@ -328,9 +349,14 @@ describe('findStartNodes', () => {
 			);
 
 		// ACT
-		const startNodes = findStartNodes(graph, node1, node2, {
-			[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
-			[node1.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 1 }])],
+		const startNodes = findStartNodes({
+			graph,
+			trigger: node1,
+			destination: node2,
+			runData: {
+				[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
+				[node1.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 1 }])],
+			},
 		});
 
 		// ASSERT
@@ -363,7 +389,7 @@ describe('findStartNodes', () => {
 		const pinData: IPinData = {};
 
 		// ACT
-		const startNodes = findStartNodes(graph, trigger, node2, runData, pinData);
+		const startNodes = findStartNodes({ graph, trigger, destination: node2, runData, pinData });
 
 		// ASSERT
 		expect(startNodes).toHaveLength(1);
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
index d82f73e9e3..fceb22da06 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
@@ -9,11 +9,13 @@
 // XX denotes that the node is disabled
 // PD denotes that the node has pinned data
 
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { createNodeData } from './helpers';
 import { DirectedGraph } from '../DirectedGraph';
 import { findSubgraph } from '../findSubgraph';
-import { createNodeData } from './helpers';
 
-describe('findSubgraph2', () => {
+describe('findSubgraph', () => {
 	//                 ►►
 	//  ┌───────┐     ┌───────────┐
 	//  │trigger├────►│destination│
@@ -26,7 +28,7 @@ describe('findSubgraph2', () => {
 			.addNodes(trigger, destination)
 			.addConnections({ from: trigger, to: destination });
 
-		const subgraph = findSubgraph(graph, destination, trigger);
+		const subgraph = findSubgraph({ graph, destination, trigger });
 
 		expect(subgraph).toEqual(graph);
 	});
@@ -48,7 +50,7 @@ describe('findSubgraph2', () => {
 				{ from: ifNode, to: noOp, outputIndex: 1 },
 			);
 
-		const subgraph = findSubgraph(graph, noOp, ifNode);
+		const subgraph = findSubgraph({ graph, destination: noOp, trigger: ifNode });
 
 		expect(subgraph).toEqual(graph);
 	});
@@ -68,7 +70,7 @@ describe('findSubgraph2', () => {
 			.addNodes(trigger, destination, node)
 			.addConnections({ from: trigger, to: destination }, { from: destination, to: node });
 
-		const subgraph = findSubgraph(graph, destination, trigger);
+		const subgraph = findSubgraph({ graph, destination, trigger });
 
 		expect(subgraph).toEqual(
 			new DirectedGraph()
@@ -83,6 +85,12 @@ describe('findSubgraph2', () => {
 	//  │trigger│         │disabled├─────►│destination│
 	//  │       ├────────►│        │      └───────────┘
 	//  └───────┘         └────────┘
+	// turns into
+	//  ┌───────┐       ►►
+	//  │       │      ┌───────────┐
+	//  │trigger├─────►│destination│
+	//  │       │      └───────────┘
+	//  └───────┘
 	test('skip disabled nodes', () => {
 		const trigger = createNodeData({ name: 'trigger' });
 		const disabled = createNodeData({ name: 'disabled', disabled: true });
@@ -92,7 +100,7 @@ describe('findSubgraph2', () => {
 			.addNodes(trigger, disabled, destination)
 			.addConnections({ from: trigger, to: disabled }, { from: disabled, to: destination });
 
-		const subgraph = findSubgraph(graph, destination, trigger);
+		const subgraph = findSubgraph({ graph, destination, trigger });
 
 		expect(subgraph).toEqual(
 			new DirectedGraph()
@@ -101,6 +109,40 @@ describe('findSubgraph2', () => {
 		);
 	});
 
+	//                 XX          XX
+	//  ┌───────┐     ┌─────┐     ┌─────┐     ┌───────────┐
+	//  │trigger├────►│node1├────►│node2├────►│destination│
+	//  └───────┘     └─────┘     └─────┘     └───────────┘
+	// turns into
+	//  ┌───────┐     ┌───────────┐
+	//  │trigger├────►│destination│
+	//  └───────┘     └───────────┘
+	test('skip multiple disabled nodes', () => {
+		// ARRANGE
+		const trigger = createNodeData({ name: 'trigger' });
+		const disabledNode1 = createNodeData({ name: 'disabledNode1', disabled: true });
+		const disabledNode2 = createNodeData({ name: 'disabledNode2', disabled: true });
+		const destination = createNodeData({ name: 'destination' });
+
+		const graph = new DirectedGraph()
+			.addNodes(trigger, disabledNode1, disabledNode2, destination)
+			.addConnections(
+				{ from: trigger, to: disabledNode1 },
+				{ from: disabledNode1, to: disabledNode2 },
+				{ from: disabledNode2, to: destination },
+			);
+
+		// ACT
+		const subgraph = findSubgraph({ graph, destination, trigger });
+
+		// ASSERT
+		expect(subgraph).toEqual(
+			new DirectedGraph()
+				.addNodes(trigger, destination)
+				.addConnections({ from: trigger, to: destination }),
+		);
+	});
+
 	//                                ►►
 	//  ┌───────┐       ┌─────┐      ┌─────┐
 	//  │Trigger├───┬──►│Node1├───┬─►│Node2│
@@ -121,7 +163,7 @@ describe('findSubgraph2', () => {
 			);
 
 		// ACT
-		const subgraph = findSubgraph(graph, node2, trigger);
+		const subgraph = findSubgraph({ graph, destination: node2, trigger });
 
 		// ASSERT
 		expect(subgraph).toEqual(graph);
@@ -145,7 +187,7 @@ describe('findSubgraph2', () => {
 			.addConnections({ from: trigger, to: node1 }, { from: node2, to: node1 });
 
 		// ACT
-		const subgraph = findSubgraph(graph, node1, trigger);
+		const subgraph = findSubgraph({ graph, destination: node1, trigger });
 
 		// ASSERT
 		expect(subgraph).toEqual(
@@ -173,7 +215,7 @@ describe('findSubgraph2', () => {
 			);
 
 		// ACT
-		const subgraph = findSubgraph(graph, destination, trigger);
+		const subgraph = findSubgraph({ graph, destination, trigger });
 
 		// ASSERT
 		expect(subgraph).toEqual(
@@ -182,4 +224,110 @@ describe('findSubgraph2', () => {
 				.addConnections({ from: trigger, to: destination }),
 		);
 	});
+
+	describe('root nodes', () => {
+		//                 ►►
+		//  ┌───────┐      ┌───────────┐
+		//  │trigger├─────►│destination│
+		//  └───────┘      └──▲────────┘
+		//                    │AiLanguageModel
+		//                   ┌┴──────┐
+		//                   │aiModel│
+		//                   └───────┘
+		test('always retain connections that have a different type than `NodeConnectionType.Main`', () => {
+			// ARRANGE
+			const trigger = createNodeData({ name: 'trigger' });
+			const destination = createNodeData({ name: 'destination' });
+			const aiModel = createNodeData({ name: 'ai_model' });
+
+			const graph = new DirectedGraph()
+				.addNodes(trigger, destination, aiModel)
+				.addConnections(
+					{ from: trigger, to: destination },
+					{ from: aiModel, type: NodeConnectionType.AiLanguageModel, to: destination },
+				);
+
+			// ACT
+			const subgraph = findSubgraph({ graph, destination, trigger });
+
+			// ASSERT
+			expect(subgraph).toEqual(graph);
+		});
+
+		// This graph is not possible, it's only here to make sure `findSubgraph`
+		// does not follow non-Main connections.
+		//
+		//  ┌────┐   ┌───────────┐
+		//  │root┼───►destination│
+		//  └──▲─┘   └───────────┘
+		//     │AiLanguageModel
+		//    ┌┴──────┐
+		//    │aiModel│
+		//    └▲──────┘
+		//    ┌┴──────┐
+		//    │trigger│
+		//    └───────┘
+		// turns into an empty graph, because there is no `Main` typed connection
+		// connecting destination and trigger.
+		test('skip non-Main connection types', () => {
+			// ARRANGE
+			const trigger = createNodeData({ name: 'trigger' });
+			const root = createNodeData({ name: 'root' });
+			const aiModel = createNodeData({ name: 'aiModel' });
+			const destination = createNodeData({ name: 'destination' });
+			const graph = new DirectedGraph()
+				.addNodes(trigger, root, aiModel, destination)
+				.addConnections(
+					{ from: trigger, to: aiModel },
+					{ from: aiModel, type: NodeConnectionType.AiLanguageModel, to: root },
+					{ from: root, to: destination },
+				);
+
+			// ACT
+			const subgraph = findSubgraph({ graph, destination, trigger });
+
+			// ASSERT
+			expect(subgraph.getConnections()).toHaveLength(0);
+			expect(subgraph.getNodes().size).toBe(0);
+		});
+
+		//
+		//              XX
+		//  ┌───────┐   ┌────┐   ┌───────────┐
+		//  │trigger├───►root├───►destination│
+		//  └───────┘   └──▲─┘   └───────────┘
+		//                 │AiLanguageModel
+		//                ┌┴──────┐
+		//                │aiModel│
+		//                └───────┘
+		// turns into
+		//  ┌───────┐            ┌───────────┐
+		//  │trigger├────────────►destination│
+		//  └───────┘            └───────────┘
+		test('skip disabled root nodes', () => {
+			// ARRANGE
+			const trigger = createNodeData({ name: 'trigger' });
+			const root = createNodeData({ name: 'root', disabled: true });
+			const aiModel = createNodeData({ name: 'ai_model' });
+			const destination = createNodeData({ name: 'destination' });
+
+			const graph = new DirectedGraph()
+				.addNodes(trigger, root, aiModel, destination)
+				.addConnections(
+					{ from: trigger, to: root },
+					{ from: aiModel, type: NodeConnectionType.AiLanguageModel, to: root },
+					{ from: root, to: destination },
+				);
+
+			// ACT
+			const subgraph = findSubgraph({ graph, destination: root, trigger });
+
+			// ASSERT
+			expect(subgraph).toEqual(
+				new DirectedGraph()
+					.addNodes(trigger, destination)
+					.addConnections({ from: trigger, to: destination }),
+			);
+		});
+	});
 });
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts
index 737d0a2754..dffbe310d1 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts
@@ -9,8 +9,9 @@
 
 import type { IPinData } from 'n8n-workflow';
 import { NodeConnectionType, type IRunData } from 'n8n-workflow';
-import { DirectedGraph } from '../DirectedGraph';
+
 import { createNodeData, toITaskData } from './helpers';
+import { DirectedGraph } from '../DirectedGraph';
 import { getSourceDataGroups } from '../getSourceDataGroups';
 
 describe('getSourceDataGroups', () => {
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts
index 42cbe1f5ff..a4bcac23a5 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts
@@ -9,12 +9,14 @@
 // XX denotes that the node is disabled
 // PD denotes that the node has pinned data
 
-import { recreateNodeExecutionStack } from '@/PartialExecutionUtils/recreateNodeExecutionStack';
-import { type IPinData, type IRunData } from 'n8n-workflow';
 import { AssertionError } from 'assert';
+import { type IPinData, type IRunData } from 'n8n-workflow';
+
+import { recreateNodeExecutionStack } from '@/PartialExecutionUtils/recreateNodeExecutionStack';
+
+import { createNodeData, toITaskData } from './helpers';
 import { DirectedGraph } from '../DirectedGraph';
 import { findSubgraph } from '../findSubgraph';
-import { createNodeData, toITaskData } from './helpers';
 
 describe('recreateNodeExecutionStack', () => {
 	//                   ►►
@@ -30,7 +32,7 @@ describe('recreateNodeExecutionStack', () => {
 			.addNodes(trigger, node)
 			.addConnections({ from: trigger, to: node });
 
-		const workflow = findSubgraph(graph, node, trigger);
+		const workflow = findSubgraph({ graph, destination: node, trigger });
 		const startNodes = [node];
 		const runData: IRunData = {
 			[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/toIConnections.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/toIConnections.test.ts
index a2524bf3ce..e5ea0e658a 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/toIConnections.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/toIConnections.test.ts
@@ -1,4 +1,5 @@
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { createNodeData, toIConnections } from './helpers';
 
 test('toIConnections', () => {
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/toITaskData.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/toITaskData.test.ts
index e255836339..fe9c3f132a 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/toITaskData.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/toITaskData.test.ts
@@ -1,4 +1,5 @@
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { toITaskData } from './helpers';
 
 test('toITaskData', function () {
diff --git a/packages/core/src/PartialExecutionUtils/cleanRunData.ts b/packages/core/src/PartialExecutionUtils/cleanRunData.ts
index 945dca1451..5d74a3575a 100644
--- a/packages/core/src/PartialExecutionUtils/cleanRunData.ts
+++ b/packages/core/src/PartialExecutionUtils/cleanRunData.ts
@@ -1,4 +1,5 @@
 import type { INode, IRunData } from 'n8n-workflow';
+
 import type { DirectedGraph } from './DirectedGraph';
 
 /**
diff --git a/packages/core/src/PartialExecutionUtils/findStartNodes.ts b/packages/core/src/PartialExecutionUtils/findStartNodes.ts
index 910045d709..a6165f6564 100644
--- a/packages/core/src/PartialExecutionUtils/findStartNodes.ts
+++ b/packages/core/src/PartialExecutionUtils/findStartNodes.ts
@@ -1,4 +1,5 @@
 import type { INode, IPinData, IRunData } from 'n8n-workflow';
+
 import type { DirectedGraph } from './DirectedGraph';
 import { getIncomingData } from './getIncomingData';
 
@@ -79,7 +80,7 @@ function findStartNodesRecursive(
 	}
 
 	// Recurse with every direct child that is part of the sub graph.
-	const outGoingConnections = graph.getDirectChildren(current);
+	const outGoingConnections = graph.getDirectChildConnections(current);
 	for (const outGoingConnection of outGoingConnections) {
 		const nodeRunData = getIncomingData(
 			runData,
@@ -130,13 +131,19 @@ function findStartNodesRecursive(
  * 	  - stop following the branch, there is no start node on this branch
  * 	4. Recurse with every direct child that is part of the sub graph
  */
-export function findStartNodes(
-	graph: DirectedGraph,
-	trigger: INode,
-	destination: INode,
-	runData: IRunData = {},
-	pinData: IPinData = {},
-): INode[] {
+export function findStartNodes(options: {
+	graph: DirectedGraph;
+	trigger: INode;
+	destination: INode;
+	runData?: IRunData;
+	pinData?: IPinData;
+}): INode[] {
+	const graph = options.graph;
+	const trigger = options.trigger;
+	const destination = options.destination;
+	const runData = options.runData ?? {};
+	const pinData = options.pinData ?? {};
+
 	const startNodes = findStartNodesRecursive(
 		graph,
 		trigger,
diff --git a/packages/core/src/PartialExecutionUtils/findSubgraph.ts b/packages/core/src/PartialExecutionUtils/findSubgraph.ts
index 2b1ceb2998..4d3bc4cc3f 100644
--- a/packages/core/src/PartialExecutionUtils/findSubgraph.ts
+++ b/packages/core/src/PartialExecutionUtils/findSubgraph.ts
@@ -1,4 +1,5 @@
-import type { INode } from 'n8n-workflow';
+import { NodeConnectionType, type INode } from 'n8n-workflow';
+
 import type { GraphConnection } from './DirectedGraph';
 import { DirectedGraph } from './DirectedGraph';
 
@@ -20,7 +21,7 @@ function findSubgraphRecursive(
 		return;
 	}
 
-	let parentConnections = graph.getDirectParents(current);
+	let parentConnections = graph.getDirectParentConnections(current);
 
 	// If the current node has no parents, don’t keep this branch.
 	if (parentConnections.length === 0) {
@@ -50,31 +51,31 @@ function findSubgraphRecursive(
 	// Take every incoming connection and connect it to every node that is
 	// connected to the current node’s first output
 	if (current.disabled) {
-		const incomingConnections = graph.getDirectParents(current);
-		const outgoingConnections = graph
-			.getDirectChildren(current)
-			// NOTE: When a node is disabled only the first output gets data
-			.filter((connection) => connection.outputIndex === 0);
+		// The last segment on the current branch is still pointing to the removed
+		// node, so let's remove it.
+		currentBranch.pop();
 
-		parentConnections = [];
-
-		for (const incomingConnection of incomingConnections) {
-			for (const outgoingConnection of outgoingConnections) {
-				const newConnection = {
-					...incomingConnection,
-					to: outgoingConnection.to,
-					inputIndex: outgoingConnection.inputIndex,
-				};
-
-				parentConnections.push(newConnection);
-				currentBranch.pop();
-				currentBranch.push(newConnection);
-			}
-		}
+		// The node is replaced by a set of new connections, connecting the parents
+		// and children of it directly. In the recursive call below we'll follow
+		// them further.
+		parentConnections = graph.removeNode(current, {
+			reconnectConnections: true,
+			// If the node has non-Main connections we don't want to rewire those.
+			// Otherwise we'd end up connecting AI utilities to nodes that don't
+			// support them.
+			skipConnectionFn: (c) => c.type !== NodeConnectionType.Main,
+		});
 	}
 
 	// Recurse on each parent.
 	for (const parentConnection of parentConnections) {
+		// Skip parents that are connected via non-Main connection types. They are
+		// only utility nodes for AI and are not part of the data or control flow
+		// and can never lead too the trigger.
+		if (parentConnection.type !== NodeConnectionType.Main) {
+			continue;
+		}
+
 		findSubgraphRecursive(graph, destinationNode, parentConnection.from, trigger, newGraph, [
 			...currentBranch,
 			parentConnection,
@@ -99,15 +100,41 @@ function findSubgraphRecursive(
  *     - take every incoming connection and connect it to every node that is
  *       connected to the current node’s first output
  *   6. Recurse on each parent
+ *   7. Re-add all connections that don't use the `Main` connections type.
+ *      Theses are used by nodes called root nodes and they are not part of the
+ *      dataflow in the graph they are utility nodes, like the AI model used in a
+ *      lang chain node.
  */
-export function findSubgraph(
-	graph: DirectedGraph,
-	destinationNode: INode,
-	trigger: INode,
-): DirectedGraph {
-	const newGraph = new DirectedGraph();
+export function findSubgraph(options: {
+	graph: DirectedGraph;
+	destination: INode;
+	trigger: INode;
+}): DirectedGraph {
+	const graph = options.graph;
+	const destination = options.destination;
+	const trigger = options.trigger;
+	const subgraph = new DirectedGraph();
 
-	findSubgraphRecursive(graph, destinationNode, destinationNode, trigger, newGraph, []);
+	findSubgraphRecursive(graph, destination, destination, trigger, subgraph, []);
 
-	return newGraph;
+	// For each node in the subgraph, if it has parent connections of a type that
+	// is not `Main` in the input graph, add the connections and the nodes
+	// connected to it to the subgraph
+	//
+	// Without this all AI related workflows would not work when executed
+	// partially, because all utility nodes would be missing.
+	for (const node of subgraph.getNodes().values()) {
+		const parentConnections = graph.getParentConnections(node);
+
+		for (const connection of parentConnections) {
+			if (connection.type === NodeConnectionType.Main) {
+				continue;
+			}
+
+			subgraph.addNodes(connection.from, connection.to);
+			subgraph.addConnection(connection);
+		}
+	}
+
+	return subgraph;
 }
diff --git a/packages/core/src/PartialExecutionUtils/findTriggerForPartialExecution.ts b/packages/core/src/PartialExecutionUtils/findTriggerForPartialExecution.ts
index baae6e7304..977e99c107 100644
--- a/packages/core/src/PartialExecutionUtils/findTriggerForPartialExecution.ts
+++ b/packages/core/src/PartialExecutionUtils/findTriggerForPartialExecution.ts
@@ -1,5 +1,5 @@
-import type { INode, Workflow } from 'n8n-workflow';
 import * as assert from 'assert/strict';
+import type { INode, Workflow } from 'n8n-workflow';
 
 function findAllParentTriggers(workflow: Workflow, destinationNodeName: string) {
 	const parentNodes = workflow
diff --git a/packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts b/packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts
index b1e3334440..4926becb79 100644
--- a/packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts
+++ b/packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts
@@ -1,3 +1,4 @@
+import * as a from 'assert/strict';
 import {
 	NodeConnectionType,
 	type IExecuteData,
@@ -11,7 +12,6 @@ import {
 	type IWaitingForExecutionSource,
 } from 'n8n-workflow';
 
-import * as a from 'assert/strict';
 import type { DirectedGraph } from './DirectedGraph';
 import { getIncomingData } from './getIncomingData';
 import { getSourceDataGroups } from './getSourceDataGroups';
@@ -44,12 +44,12 @@ export function recreateNodeExecutionStack(
 	// Validate invariants.
 
 	// The graph needs to be free of disabled nodes. If it's not it hasn't been
-	// passed through findSubgraph2.
+	// passed through findSubgraph.
 	for (const node of graph.getNodes().values()) {
 		a.notEqual(
 			node.disabled,
 			true,
-			`Graph contains disabled nodes. This is not supported. Make sure to pass the graph through "findSubgraph2" before calling "recreateNodeExecutionStack". The node in question is "${node.name}"`,
+			`Graph contains disabled nodes. This is not supported. Make sure to pass the graph through "findSubgraph" before calling "recreateNodeExecutionStack". The node in question is "${node.name}"`,
 		);
 	}
 
@@ -64,7 +64,7 @@ export function recreateNodeExecutionStack(
 
 	for (const startNode of startNodes) {
 		const incomingStartNodeConnections = graph
-			.getDirectParents(startNode)
+			.getDirectParentConnections(startNode)
 			.filter((c) => c.type === NodeConnectionType.Main);
 
 		let incomingData: INodeExecutionData[][] = [];
@@ -135,7 +135,7 @@ export function recreateNodeExecutionStack(
 			// Check if the destinationNode has to be added as waiting
 			// because some input data is already fully available
 			const incomingDestinationNodeConnections = graph
-				.getDirectParents(destinationNode)
+				.getDirectParentConnections(destinationNode)
 				.filter((c) => c.type === NodeConnectionType.Main);
 			if (incomingDestinationNodeConnections !== undefined) {
 				for (const connection of incomingDestinationNodeConnections) {
diff --git a/packages/core/src/SSHClientsManager.ts b/packages/core/src/SSHClientsManager.ts
index 78126f96e8..17046a26eb 100644
--- a/packages/core/src/SSHClientsManager.ts
+++ b/packages/core/src/SSHClientsManager.ts
@@ -1,7 +1,7 @@
-import { Service } from 'typedi';
-import { Client, type ConnectConfig } from 'ssh2';
-import { createHash } from 'node:crypto';
 import type { SSHCredentials } from 'n8n-workflow';
+import { createHash } from 'node:crypto';
+import { Client, type ConnectConfig } from 'ssh2';
+import { Service } from 'typedi';
 
 @Service()
 export class SSHClientsManager {
diff --git a/packages/core/src/ScheduledTaskManager.ts b/packages/core/src/ScheduledTaskManager.ts
index eb519a60a7..00396903a5 100644
--- a/packages/core/src/ScheduledTaskManager.ts
+++ b/packages/core/src/ScheduledTaskManager.ts
@@ -1,6 +1,7 @@
-import { Service } from 'typedi';
 import { CronJob } from 'cron';
 import type { CronExpression, Workflow } from 'n8n-workflow';
+import { Service } from 'typedi';
+
 import { InstanceSettings } from './InstanceSettings';
 
 @Service()
@@ -29,8 +30,9 @@ export class ScheduledTaskManager {
 
 	deregisterCrons(workflowId: string) {
 		const cronJobs = this.cronJobs.get(workflowId) ?? [];
-		for (const cronJob of cronJobs) {
-			cronJob.stop();
+		while (cronJobs.length) {
+			const cronJob = cronJobs.pop();
+			if (cronJob) cronJob.stop();
 		}
 	}
 
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index a10d8c530c..ec5963a54b 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -2,9 +2,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
+import * as assert from 'assert/strict';
 import { setMaxListeners } from 'events';
-import PCancelable from 'p-cancelable';
-
+import get from 'lodash/get';
 import type {
 	ExecutionBaseError,
 	ExecutionStatus,
@@ -46,11 +46,9 @@ import {
 	sleep,
 	ErrorReporterProxy,
 } from 'n8n-workflow';
-import get from 'lodash/get';
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
+import PCancelable from 'p-cancelable';
 
-import * as assert from 'assert/strict';
-import { recreateNodeExecutionStack } from './PartialExecutionUtils/recreateNodeExecutionStack';
+import * as NodeExecuteFunctions from './NodeExecuteFunctions';
 import {
 	DirectedGraph,
 	findCycles,
@@ -59,6 +57,7 @@ import {
 	findTriggerForPartialExecution,
 } from './PartialExecutionUtils';
 import { cleanRunData } from './PartialExecutionUtils/cleanRunData';
+import { recreateNodeExecutionStack } from './PartialExecutionUtils/recreateNodeExecutionStack';
 
 export class WorkflowExecute {
 	private status: ExecutionStatus = 'new';
@@ -88,7 +87,7 @@ export class WorkflowExecute {
 	 * Executes the given workflow.
 	 *
 	 * @param {Workflow} workflow The workflow to execute
-	 * @param {INode[]} [startNodes] Node to start execution from
+	 * @param {INode[]} [startNode] Node to start execution from
 	 * @param {string} [destinationNode] Node to stop execution at
 	 */
 	// IMPORTANT: Do not add "async" to this function, it will then convert the
@@ -333,9 +332,9 @@ export class WorkflowExecute {
 			'a destinationNodeName is required for the new partial execution flow',
 		);
 
-		const destinationNode = workflow.getNode(destinationNodeName);
+		const destination = workflow.getNode(destinationNodeName);
 		assert.ok(
-			destinationNode,
+			destination,
 			`Could not find a node with the name ${destinationNodeName} in the workflow.`,
 		);
 
@@ -349,11 +348,11 @@ export class WorkflowExecute {
 
 		// 2. Find the Subgraph
 		const graph = DirectedGraph.fromWorkflow(workflow);
-		const subgraph = findSubgraph(graph, destinationNode, trigger);
+		const subgraph = findSubgraph({ graph, destination, trigger });
 		const filteredNodes = subgraph.getNodes();
 
 		// 3. Find the Start Nodes
-		const startNodes = findStartNodes(subgraph, trigger, destinationNode, runData);
+		const startNodes = findStartNodes({ graph: subgraph, trigger, destination, runData });
 
 		// 4. Detect Cycles
 		const cycles = findCycles(workflow);
@@ -368,7 +367,7 @@ export class WorkflowExecute {
 
 		// 7. Recreate Execution Stack
 		const { nodeExecutionStack, waitingExecution, waitingExecutionSource } =
-			recreateNodeExecutionStack(subgraph, startNodes, destinationNode, runData, pinData ?? {});
+			recreateNodeExecutionStack(subgraph, startNodes, destination, runData, pinData ?? {});
 
 		// 8. Execute
 		this.status = 'running';
@@ -1059,7 +1058,7 @@ export class WorkflowExecute {
 						this.runExecutionData.startData!.runNodeFilter.indexOf(executionNode.name) === -1
 					) {
 						// If filter is set and node is not on filter skip it, that avoids the problem that it executes
-						// leafs that are parallel to a selected destinationNode. Normally it would execute them because
+						// leaves that are parallel to a selected destinationNode. Normally it would execute them because
 						// they have the same parent and it executes all child nodes.
 						continue;
 					}
@@ -1760,7 +1759,7 @@ export class WorkflowExecute {
 										continue;
 									}
 								} else {
-									// A certain amout of inputs are required (amount of inputs)
+									// A certain amount of inputs are required (amount of inputs)
 									if (inputsWithData.length < requiredInputs) {
 										continue;
 									}
@@ -1818,7 +1817,7 @@ export class WorkflowExecute {
 								// Node to add did not get found, rather an empty one removed so continue with search
 								waitingNodes = Object.keys(this.runExecutionData.executionData!.waitingExecution);
 								// Set counter to start again from the beginning. Set it to -1 as it auto increments
-								// after run. So only like that will we end up again ot 0.
+								// after run. So only like that will we end up again at 0.
 								i = -1;
 							}
 						}
diff --git a/packages/core/src/data-deduplication-service.ts b/packages/core/src/data-deduplication-service.ts
new file mode 100644
index 0000000000..4b7a51fcc2
--- /dev/null
+++ b/packages/core/src/data-deduplication-service.ts
@@ -0,0 +1,124 @@
+import get from 'lodash/get';
+import type {
+	IDataDeduplicator,
+	ICheckProcessedOptions,
+	IDeduplicationOutput,
+	IDeduplicationOutputItems,
+	IDataObject,
+	DeduplicationScope,
+	DeduplicationItemTypes,
+	ICheckProcessedContextData,
+} from 'n8n-workflow';
+import * as assert from 'node:assert/strict';
+
+/**
+ * A singleton service responsible for data deduplication.
+ * This service wraps around the IDataDeduplicator interface and provides methods to handle
+ * deduplication-related operations such as checking, recording, and clearing processed data.
+ */
+export class DataDeduplicationService {
+	private static instance: DataDeduplicationService;
+
+	private deduplicator: IDataDeduplicator;
+
+	private constructor(deduplicator: IDataDeduplicator) {
+		this.deduplicator = deduplicator;
+	}
+
+	private assertDeduplicator() {
+		assert.ok(
+			this.deduplicator,
+			'Manager needs to initialized before use. Make sure to call init()',
+		);
+	}
+
+	private static assertInstance() {
+		assert.ok(
+			DataDeduplicationService.instance,
+			'Instance needs to initialized before use. Make sure to call init()',
+		);
+	}
+
+	private static assertSingleInstance() {
+		assert.ok(
+			!DataDeduplicationService.instance,
+			'Instance already initialized. Multiple initializations are not allowed.',
+		);
+	}
+
+	static async init(deduplicator: IDataDeduplicator): Promise<void> {
+		this.assertSingleInstance();
+		DataDeduplicationService.instance = new DataDeduplicationService(deduplicator);
+	}
+
+	static getInstance(): DataDeduplicationService {
+		this.assertInstance();
+		return DataDeduplicationService.instance;
+	}
+
+	async checkProcessedItemsAndRecord(
+		propertyName: string,
+		items: IDataObject[],
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutputItems> {
+		this.assertDeduplicator();
+		let value;
+		const itemLookup = items.reduce((acc, cur, index) => {
+			value = JSON.stringify(get(cur, propertyName));
+			acc[value ? value.toString() : ''] = index;
+			return acc;
+		}, {});
+
+		const checkedItems = await this.deduplicator.checkProcessedAndRecord(
+			Object.keys(itemLookup),
+			scope,
+			contextData,
+			options,
+		);
+
+		return {
+			new: checkedItems.new.map((key) => items[itemLookup[key] as number]),
+			processed: checkedItems.processed.map((key) => items[itemLookup[key] as number]),
+		};
+	}
+
+	async checkProcessedAndRecord(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutput> {
+		this.assertDeduplicator();
+		return await this.deduplicator.checkProcessedAndRecord(items, scope, contextData, options);
+	}
+
+	async removeProcessed(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<void> {
+		this.assertDeduplicator();
+		return await this.deduplicator.removeProcessed(items, scope, contextData, options);
+	}
+
+	async clearAllProcessedItems(
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<void> {
+		this.assertDeduplicator();
+		return await this.deduplicator.clearAllProcessedItems(scope, contextData, options);
+	}
+
+	async getProcessedDataCount(
+		scope: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<number> {
+		this.assertDeduplicator();
+		return await this.deduplicator.getProcessedDataCount(scope, contextData, options);
+	}
+}
diff --git a/packages/core/src/errors/invalid-mode.error.ts b/packages/core/src/errors/invalid-mode.error.ts
index 348fbb410d..179582911a 100644
--- a/packages/core/src/errors/invalid-mode.error.ts
+++ b/packages/core/src/errors/invalid-mode.error.ts
@@ -1,4 +1,5 @@
 import { ApplicationError } from 'n8n-workflow';
+
 import { CONFIG_MODES } from '../BinaryData/utils';
 
 export class InvalidModeError extends ApplicationError {
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index c6b8450a4f..ebe240b51e 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -14,6 +14,7 @@ export { InstanceSettings, InstanceType } from './InstanceSettings';
 export * from './NodeExecuteFunctions';
 export * from './WorkflowExecute';
 export { NodeExecuteFunctions };
+export * from './data-deduplication-service';
 export * from './errors';
 export { ObjectStoreService } from './ObjectStore/ObjectStore.service.ee';
 export { BinaryData } from './BinaryData/types';
diff --git a/packages/core/test/BinaryData/utils.test.ts b/packages/core/test/BinaryData/utils.test.ts
index 95a138c00d..50a7f165df 100644
--- a/packages/core/test/BinaryData/utils.test.ts
+++ b/packages/core/test/BinaryData/utils.test.ts
@@ -1,5 +1,6 @@
 import { Readable } from 'node:stream';
 import { createGunzip } from 'node:zlib';
+
 import { binaryToBuffer } from '@/BinaryData/utils';
 
 describe('BinaryData/utils', () => {
diff --git a/packages/core/test/Cipher.test.ts b/packages/core/test/Cipher.test.ts
index 1b7c0de944..e3dfa609fa 100644
--- a/packages/core/test/Cipher.test.ts
+++ b/packages/core/test/Cipher.test.ts
@@ -1,6 +1,8 @@
 import Container from 'typedi';
-import { InstanceSettings } from '@/InstanceSettings';
+
 import { Cipher } from '@/Cipher';
+import { InstanceSettings } from '@/InstanceSettings';
+
 import { mockInstance } from './utils';
 
 describe('Cipher', () => {
diff --git a/packages/core/test/CreateNodeAsTool.test.ts b/packages/core/test/CreateNodeAsTool.test.ts
index c4509e08be..5c485b9837 100644
--- a/packages/core/test/CreateNodeAsTool.test.ts
+++ b/packages/core/test/CreateNodeAsTool.test.ts
@@ -1,8 +1,9 @@
-import { createNodeAsTool } from '@/CreateNodeAsTool';
 import type { IExecuteFunctions, INodeParameters, INodeType } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import { z } from 'zod';
 
+import { createNodeAsTool } from '@/CreateNodeAsTool';
+
 jest.mock('@langchain/core/tools', () => ({
 	DynamicStructuredTool: jest.fn().mockImplementation((config) => ({
 		name: config.name,
@@ -18,10 +19,12 @@ describe('createNodeAsTool', () => {
 	let mockNodeParameters: INodeParameters;
 
 	beforeEach(() => {
+		// Setup mock objects
 		mockCtx = {
 			getNodeParameter: jest.fn(),
-			addInputData: jest.fn(),
+			addInputData: jest.fn().mockReturnValue({ index: 0 }),
 			addOutputData: jest.fn(),
+			getNode: jest.fn().mockReturnValue({ name: 'Test_Node' }),
 		} as unknown as IExecuteFunctions;
 
 		mockNode = {
@@ -33,60 +36,456 @@ describe('createNodeAsTool', () => {
 		} as unknown as INodeType;
 
 		mockNodeParameters = {
-			param1: "{{ '__PLACEHOLDER: Test parameter' }}",
+			param1: "={{$fromAI('param1', 'Test parameter', 'string') }}",
 			param2: 'static value',
 			nestedParam: {
-				subParam: "{{ '__PLACEHOLDER: Nested parameter' }}",
+				subParam: "={{ $fromAI('subparam', 'Nested parameter', 'string') }}",
 			},
+			descriptionType: 'auto',
+			resource: 'testResource',
+			operation: 'testOperation',
 		};
+
 		jest.clearAllMocks();
 	});
 
-	it('should create a DynamicStructuredTool with correct properties', () => {
-		const tool = createNodeAsTool(mockNode, mockCtx, mockNodeParameters);
+	describe('Tool Creation and Basic Properties', () => {
+		it('should create a DynamicStructuredTool with correct properties', () => {
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
 
-		expect(tool).toBeDefined();
-		expect(tool.name).toBe('TestNode');
-		expect(tool.description).toBe('Test node description');
-		expect(tool.schema).toBeDefined();
+			expect(tool).toBeDefined();
+			expect(tool.name).toBe('Test_Node');
+			expect(tool.description).toBe(
+				'Test node description\n Resource: testResource\n Operation: testOperation',
+			);
+			expect(tool.schema).toBeDefined();
+		});
+
+		it('should use toolDescription if provided', () => {
+			mockNodeParameters.descriptionType = 'manual';
+			mockNodeParameters.toolDescription = 'Custom tool description';
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.description).toBe('Custom tool description');
+		});
 	});
 
-	it('should use toolDescription if provided', () => {
-		const customDescription = 'Custom tool description';
-		(mockCtx.getNodeParameter as jest.Mock).mockReturnValue(customDescription);
+	describe('Schema Creation and Parameter Handling', () => {
+		it('should create a schema based on fromAI arguments in nodeParameters', () => {
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
 
-		const tool = createNodeAsTool(mockNode, mockCtx, mockNodeParameters);
+			expect(tool.schema).toBeDefined();
+			expect(tool.schema.shape).toHaveProperty('param1');
+			expect(tool.schema.shape).toHaveProperty('subparam');
+			expect(tool.schema.shape).not.toHaveProperty('param2');
+		});
 
-		expect(tool.description).toBe(customDescription);
+		it('should handle fromAI arguments correctly', () => {
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.subparam).toBeInstanceOf(z.ZodString);
+		});
+
+		it('should handle default values correctly', () => {
+			mockNodeParameters = {
+				paramWithDefault:
+					"={{ $fromAI('paramWithDefault', 'Parameter with default', 'string', 'default value') }}",
+				numberWithDefault:
+					"={{ $fromAI('numberWithDefault', 'Number with default', 'number', 42) }}",
+				booleanWithDefault:
+					"={{ $fromAI('booleanWithDefault', 'Boolean with default', 'boolean', true) }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.paramWithDefault.description).toBe('Parameter with default');
+			expect(tool.schema.shape.numberWithDefault.description).toBe('Number with default');
+			expect(tool.schema.shape.booleanWithDefault.description).toBe('Boolean with default');
+		});
+
+		it('should handle nested parameters correctly', () => {
+			mockNodeParameters = {
+				topLevel: "={{ $fromAI('topLevel', 'Top level parameter', 'string') }}",
+				nested: {
+					level1: "={{ $fromAI('level1', 'Nested level 1', 'string') }}",
+					deeperNested: {
+						level2: "={{ $fromAI('level2', 'Nested level 2', 'number') }}",
+					},
+				},
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.topLevel).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.level1).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.level2).toBeInstanceOf(z.ZodNumber);
+		});
+
+		it('should handle array parameters correctly', () => {
+			mockNodeParameters = {
+				arrayParam: [
+					"={{ $fromAI('item1', 'First item', 'string') }}",
+					"={{ $fromAI('item2', 'Second item', 'number') }}",
+				],
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.item1).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.item2).toBeInstanceOf(z.ZodNumber);
+		});
 	});
 
-	it('should create a schema based on placeholder values in nodeParameters', () => {
-		const tool = createNodeAsTool(mockNode, mockCtx, mockNodeParameters);
+	describe('Error Handling and Edge Cases', () => {
+		it('should handle error during node execution', async () => {
+			mockNode.execute = jest.fn().mockRejectedValue(new Error('Execution failed'));
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
 
-		expect(tool.schema).toBeDefined();
-		expect(tool.schema.shape).toHaveProperty('param1');
-		expect(tool.schema.shape).toHaveProperty('nestedParam__subParam');
-		expect(tool.schema.shape).not.toHaveProperty('param2');
+			const result = await tool.func({ param1: 'test value' });
+
+			expect(result).toContain('Error during node execution:');
+			expect(mockCtx.addOutputData).toHaveBeenCalledWith(
+				NodeConnectionType.AiTool,
+				0,
+				expect.any(NodeOperationError),
+			);
+		});
+
+		it('should throw an error for invalid parameter names', () => {
+			mockNodeParameters.invalidParam = "$fromAI('invalid param', 'Invalid parameter', 'string')";
+
+			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+				'Parameter key `invalid param` is invalid',
+			);
+		});
+
+		it('should throw an error for $fromAI calls with unsupported types', () => {
+			mockNodeParameters = {
+				invalidTypeParam:
+					"={{ $fromAI('invalidType', 'Param with unsupported type', 'unsupportedType') }}",
+			};
+
+			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+				'Invalid type: unsupportedType',
+			);
+		});
+
+		it('should handle empty parameters and parameters with no fromAI calls', () => {
+			mockNodeParameters = {
+				param1: 'static value 1',
+				param2: 'static value 2',
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape).toEqual({});
+		});
 	});
 
-	it('should handle nested parameters correctly', () => {
-		const tool = createNodeAsTool(mockNode, mockCtx, mockNodeParameters);
+	describe('Parameter Name and Description Handling', () => {
+		it('should accept parameter names with underscores and hyphens', () => {
+			mockNodeParameters = {
+				validName1:
+					"={{ $fromAI('param_name-1', 'Valid name with underscore and hyphen', 'string') }}",
+				validName2: "={{ $fromAI('param_name_2', 'Another valid name', 'number') }}",
+			};
 
-		expect(tool.schema.shape.nestedParam__subParam).toBeInstanceOf(z.ZodString);
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape['param_name-1']).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape['param_name-1'].description).toBe(
+				'Valid name with underscore and hyphen',
+			);
+
+			expect(tool.schema.shape.param_name_2).toBeInstanceOf(z.ZodNumber);
+			expect(tool.schema.shape.param_name_2.description).toBe('Another valid name');
+		});
+
+		it('should throw an error for parameter names with invalid special characters', () => {
+			mockNodeParameters = {
+				invalidNameParam:
+					"={{ $fromAI('param@name!', 'Invalid name with special characters', 'string') }}",
+			};
+
+			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+				'Parameter key `param@name!` is invalid',
+			);
+		});
+
+		it('should throw an error for empty parameter name', () => {
+			mockNodeParameters = {
+				invalidNameParam: "={{ $fromAI('', 'Invalid name with special characters', 'string') }}",
+			};
+
+			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+				'You must specify a key when using $fromAI()',
+			);
+		});
+
+		it('should handle parameter names with exact and exceeding character limits', () => {
+			const longName = 'a'.repeat(64);
+			const tooLongName = 'a'.repeat(65);
+			mockNodeParameters = {
+				longNameParam: `={{ $fromAI('${longName}', 'Param with 64 character name', 'string') }}`,
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape[longName]).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape[longName].description).toBe('Param with 64 character name');
+
+			expect(() =>
+				createNodeAsTool(mockCtx, mockNode, {
+					tooLongNameParam: `={{ $fromAI('${tooLongName}', 'Param with 65 character name', 'string') }}`,
+				}),
+			).toThrow(`Parameter key \`${tooLongName}\` is invalid`);
+		});
+
+		it('should handle $fromAI calls with empty description', () => {
+			mockNodeParameters = {
+				emptyDescriptionParam: "={{ $fromAI('emptyDescription', '', 'number') }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.emptyDescription).toBeInstanceOf(z.ZodNumber);
+			expect(tool.schema.shape.emptyDescription.description).toBeUndefined();
+		});
+
+		it('should throw an error for calls with the same parameter but different descriptions', () => {
+			mockNodeParameters = {
+				duplicateParam1: "={{ $fromAI('duplicate', 'First duplicate', 'string') }}",
+				duplicateParam2: "={{ $fromAI('duplicate', 'Second duplicate', 'number') }}",
+			};
+
+			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+				"Duplicate key 'duplicate' found with different description or type",
+			);
+		});
+		it('should throw an error for calls with the same parameter but different types', () => {
+			mockNodeParameters = {
+				duplicateParam1: "={{ $fromAI('duplicate', 'First duplicate', 'string') }}",
+				duplicateParam2: "={{ $fromAI('duplicate', 'First duplicate', 'number') }}",
+			};
+
+			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+				"Duplicate key 'duplicate' found with different description or type",
+			);
+		});
 	});
 
-	it('should create a function that wraps the node execution', async () => {
-		const tool = createNodeAsTool(mockNode, mockCtx, mockNodeParameters);
+	describe('Complex Parsing Scenarios', () => {
+		it('should correctly parse $fromAI calls with varying spaces, capitalization, and within template literals', () => {
+			mockNodeParameters = {
+				varyingSpacing1: "={{$fromAI('param1','Description1','string')}}",
+				varyingSpacing2: "={{  $fromAI (  'param2' , 'Description2' , 'number' )  }}",
+				varyingSpacing3: "={{ $FROMai('param3', 'Description3', 'boolean') }}",
+				wrongCapitalization: "={{$fromai('param4','Description4','number')}}",
+				templateLiteralParam:
+					// eslint-disable-next-line n8n-local-rules/no-interpolation-in-regular-string
+					"={{ `Value is: ${$fromAI('templatedParam', 'Templated param description', 'string')}` }}",
+			};
 
-		const result = await tool.func({ param1: 'test value', nestedParam__subParam: 'nested value' });
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
 
-		expect(mockCtx.addInputData).toHaveBeenCalledWith(NodeConnectionType.AiTool, [
-			[{ json: { param1: 'test value', nestedParam__subParam: 'nested value' } }],
-		]);
-		expect(mockNode.execute).toHaveBeenCalled();
-		expect(mockCtx.addOutputData).toHaveBeenCalledWith(NodeConnectionType.AiTool, 0, [
-			[{ json: { response: [{ result: 'test' }] } }],
-		]);
-		expect(result).toBe(JSON.stringify([{ result: 'test' }]));
+			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.param1.description).toBe('Description1');
+
+			expect(tool.schema.shape.param2).toBeInstanceOf(z.ZodNumber);
+			expect(tool.schema.shape.param2.description).toBe('Description2');
+
+			expect(tool.schema.shape.param3).toBeInstanceOf(z.ZodBoolean);
+			expect(tool.schema.shape.param3.description).toBe('Description3');
+
+			expect(tool.schema.shape.param4).toBeInstanceOf(z.ZodNumber);
+			expect(tool.schema.shape.param4.description).toBe('Description4');
+
+			expect(tool.schema.shape.templatedParam).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.templatedParam.description).toBe('Templated param description');
+		});
+
+		it('should correctly parse multiple $fromAI calls interleaved with regular text', () => {
+			mockNodeParameters = {
+				interleavedParams:
+					"={{ 'Start ' + $fromAI('param1', 'First param', 'string') + ' Middle ' + $fromAI('param2', 'Second param', 'number') + ' End' }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.param1.description).toBe('First param');
+
+			expect(tool.schema.shape.param2).toBeInstanceOf(z.ZodNumber);
+			expect(tool.schema.shape.param2.description).toBe('Second param');
+		});
+
+		it('should correctly parse $fromAI calls with complex JSON default values', () => {
+			mockNodeParameters = {
+				complexJsonDefault:
+					'={{ $fromAI(\'complexJson\', \'Param with complex JSON default\', \'json\', \'{"nested": {"key": "value"}, "array": [1, 2, 3]}\') }}',
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.complexJson._def.innerType).toBeInstanceOf(z.ZodRecord);
+			expect(tool.schema.shape.complexJson.description).toBe('Param with complex JSON default');
+			expect(tool.schema.shape.complexJson._def.defaultValue()).toEqual({
+				nested: { key: 'value' },
+				array: [1, 2, 3],
+			});
+		});
+
+		it('should ignore $fromAI calls embedded in non-string node parameters', () => {
+			mockNodeParameters = {
+				numberParam: 42,
+				booleanParam: false,
+				objectParam: {
+					innerString: "={{ $fromAI('innerParam', 'Inner param', 'string') }}",
+					innerNumber: 100,
+					innerObject: {
+						deepParam: "={{ $fromAI('deepParam', 'Deep param', 'number') }}",
+					},
+				},
+				arrayParam: [
+					"={{ $fromAI('arrayParam1', 'First array param', 'string') }}",
+					200,
+					"={{ $fromAI('nestedArrayParam', 'Nested array param', 'boolean') }}",
+				],
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.innerParam).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.innerParam.description).toBe('Inner param');
+
+			expect(tool.schema.shape.deepParam).toBeInstanceOf(z.ZodNumber);
+			expect(tool.schema.shape.deepParam.description).toBe('Deep param');
+
+			expect(tool.schema.shape.arrayParam1).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.arrayParam1.description).toBe('First array param');
+
+			expect(tool.schema.shape.nestedArrayParam).toBeInstanceOf(z.ZodBoolean);
+			expect(tool.schema.shape.nestedArrayParam.description).toBe('Nested array param');
+		});
+	});
+
+	describe('Escaping and Special Characters', () => {
+		it('should handle escaped single quotes in parameter names and descriptions', () => {
+			mockNodeParameters = {
+				escapedQuotesParam:
+					"={{ $fromAI('paramName', 'Description with \\'escaped\\' quotes', 'string') }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.paramName.description).toBe("Description with 'escaped' quotes");
+		});
+
+		it('should handle escaped double quotes in parameter names and descriptions', () => {
+			mockNodeParameters = {
+				escapedQuotesParam:
+					'={{ $fromAI("paramName", "Description with \\"escaped\\" quotes", "string") }}',
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.paramName.description).toBe('Description with "escaped" quotes');
+		});
+
+		it('should handle escaped backslashes in parameter names and descriptions', () => {
+			mockNodeParameters = {
+				escapedBackslashesParam:
+					"={{ $fromAI('paramName', 'Description with \\\\ backslashes', 'string') }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.paramName.description).toBe('Description with \\ backslashes');
+		});
+
+		it('should handle mixed escaped characters in parameter names and descriptions', () => {
+			mockNodeParameters = {
+				mixedEscapesParam:
+					'={{ $fromAI(`paramName`, \'Description with \\\'mixed" characters\', "number") }}',
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodNumber);
+			expect(tool.schema.shape.paramName.description).toBe('Description with \'mixed" characters');
+		});
+	});
+
+	describe('Edge Cases and Limitations', () => {
+		it('should ignore excess arguments in $fromAI calls beyond the fourth argument', () => {
+			mockNodeParameters = {
+				excessArgsParam:
+					"={{ $fromAI('excessArgs', 'Param with excess arguments', 'string', 'default', 'extraArg1', 'extraArg2') }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.excessArgs._def.innerType).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.excessArgs.description).toBe('Param with excess arguments');
+			expect(tool.schema.shape.excessArgs._def.defaultValue()).toBe('default');
+		});
+
+		it('should correctly parse $fromAI calls with nested parentheses', () => {
+			mockNodeParameters = {
+				nestedParenthesesParam:
+					"={{ $fromAI('paramWithNested', 'Description with ((nested)) parentheses', 'string') }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.paramWithNested).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.paramWithNested.description).toBe(
+				'Description with ((nested)) parentheses',
+			);
+		});
+
+		it('should handle $fromAI calls with very long descriptions', () => {
+			const longDescription = 'A'.repeat(1000);
+			mockNodeParameters = {
+				longParam: `={{ $fromAI('longParam', '${longDescription}', 'string') }}`,
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.longParam).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.longParam.description).toBe(longDescription);
+		});
+
+		it('should handle $fromAI calls with only some parameters', () => {
+			mockNodeParameters = {
+				partialParam1: "={{ $fromAI('partial1') }}",
+				partialParam2: "={{ $fromAI('partial2', 'Description only') }}",
+				partialParam3: "={{ $fromAI('partial3', '', 'number') }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.partial1).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.partial2).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.partial3).toBeInstanceOf(z.ZodNumber);
+		});
+	});
+
+	describe('Unicode and Internationalization', () => {
+		it('should handle $fromAI calls with unicode characters', () => {
+			mockNodeParameters = {
+				unicodeParam: "={{ $fromAI('unicodeParam', '🌈 Unicode parameter 你好', 'string') }}",
+			};
+
+			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+
+			expect(tool.schema.shape.unicodeParam).toBeInstanceOf(z.ZodString);
+			expect(tool.schema.shape.unicodeParam.description).toBe('🌈 Unicode parameter 你好');
+		});
 	});
 });
diff --git a/packages/core/test/Credentials.test.ts b/packages/core/test/Credentials.test.ts
index ada86a07b0..fa7be59267 100644
--- a/packages/core/test/Credentials.test.ts
+++ b/packages/core/test/Credentials.test.ts
@@ -1,6 +1,7 @@
-import { Container } from 'typedi';
 import { mock } from 'jest-mock-extended';
 import type { CredentialInformation } from 'n8n-workflow';
+import { Container } from 'typedi';
+
 import { Cipher } from '@/Cipher';
 import { Credentials } from '@/Credentials';
 import type { InstanceSettings } from '@/InstanceSettings';
diff --git a/packages/core/test/FileSystem.manager.test.ts b/packages/core/test/FileSystem.manager.test.ts
index 7087242726..581974c0e9 100644
--- a/packages/core/test/FileSystem.manager.test.ts
+++ b/packages/core/test/FileSystem.manager.test.ts
@@ -1,9 +1,11 @@
-import path from 'node:path';
 import fs from 'node:fs';
 import fsp from 'node:fs/promises';
 import { tmpdir } from 'node:os';
+import path from 'node:path';
+
 import { FileSystemManager } from '@/BinaryData/FileSystem.manager';
 import { isStream } from '@/ObjectStore/utils';
+
 import { toFileId, toStream } from './utils';
 
 jest.mock('fs');
diff --git a/packages/core/test/InstanceSettings.test.ts b/packages/core/test/InstanceSettings.test.ts
index 414f875274..64b6840f2f 100644
--- a/packages/core/test/InstanceSettings.test.ts
+++ b/packages/core/test/InstanceSettings.test.ts
@@ -1,4 +1,5 @@
 import fs from 'fs';
+
 import { InstanceSettings } from '@/InstanceSettings';
 
 describe('InstanceSettings', () => {
diff --git a/packages/core/test/NodeExecuteFunctions.test.ts b/packages/core/test/NodeExecuteFunctions.test.ts
index 3af9c752f6..421b7cd247 100644
--- a/packages/core/test/NodeExecuteFunctions.test.ts
+++ b/packages/core/test/NodeExecuteFunctions.test.ts
@@ -1,20 +1,9 @@
-import type { SecureContextOptions } from 'tls';
-import {
-	cleanupParameterData,
-	copyInputItems,
-	ensureType,
-	getBinaryDataBuffer,
-	isFilePathBlocked,
-	parseIncomingMessage,
-	parseRequestObject,
-	proxyRequestToAxios,
-	removeEmptyBody,
-	setBinaryDataBuffer,
-} from '@/NodeExecuteFunctions';
-import { DateTime } from 'luxon';
 import { mkdtempSync, readFileSync } from 'fs';
 import type { IncomingMessage } from 'http';
+import type { Agent } from 'https';
 import { mock } from 'jest-mock-extended';
+import toPlainObject from 'lodash/toPlainObject';
+import { DateTime } from 'luxon';
 import type {
 	IBinaryData,
 	IHttpRequestMethods,
@@ -28,14 +17,26 @@ import type {
 	WorkflowHooks,
 } from 'n8n-workflow';
 import { ExpressionError } from 'n8n-workflow';
-import { BinaryDataService } from '@/BinaryData/BinaryData.service';
 import nock from 'nock';
 import { tmpdir } from 'os';
 import { join } from 'path';
+import type { SecureContextOptions } from 'tls';
 import Container from 'typedi';
-import type { Agent } from 'https';
-import toPlainObject from 'lodash/toPlainObject';
+
+import { BinaryDataService } from '@/BinaryData/BinaryData.service';
 import { InstanceSettings } from '@/InstanceSettings';
+import {
+	cleanupParameterData,
+	copyInputItems,
+	ensureType,
+	getBinaryDataBuffer,
+	isFilePathBlocked,
+	parseIncomingMessage,
+	parseRequestObject,
+	proxyRequestToAxios,
+	removeEmptyBody,
+	setBinaryDataBuffer,
+} from '@/NodeExecuteFunctions';
 
 const temporaryDir = mkdtempSync(join(tmpdir(), 'n8n'));
 
diff --git a/packages/core/test/ObjectStore.manager.test.ts b/packages/core/test/ObjectStore.manager.test.ts
index abc1f24c3a..f01e170213 100644
--- a/packages/core/test/ObjectStore.manager.test.ts
+++ b/packages/core/test/ObjectStore.manager.test.ts
@@ -1,9 +1,11 @@
-import fs from 'node:fs/promises';
 import { mock } from 'jest-mock-extended';
+import fs from 'node:fs/promises';
+
 import { ObjectStoreManager } from '@/BinaryData/ObjectStore.manager';
 import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
-import { isStream } from '@/ObjectStore/utils';
 import type { MetadataResponseHeaders } from '@/ObjectStore/types';
+import { isStream } from '@/ObjectStore/utils';
+
 import { mockInstance, toFileId, toStream } from './utils';
 
 jest.mock('fs/promises');
diff --git a/packages/core/test/ObjectStore.service.test.ts b/packages/core/test/ObjectStore.service.test.ts
index d39f08e1e2..77936c20f0 100644
--- a/packages/core/test/ObjectStore.service.test.ts
+++ b/packages/core/test/ObjectStore.service.test.ts
@@ -1,6 +1,7 @@
 import axios from 'axios';
-import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
 import { Readable } from 'stream';
+
+import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
 import { writeBlockedMessage } from '@/ObjectStore/utils';
 
 jest.mock('axios');
diff --git a/packages/core/test/SSHClientsManager.test.ts b/packages/core/test/SSHClientsManager.test.ts
index a7ceabe9f9..132a54baef 100644
--- a/packages/core/test/SSHClientsManager.test.ts
+++ b/packages/core/test/SSHClientsManager.test.ts
@@ -1,5 +1,6 @@
-import { Client } from 'ssh2';
 import type { SSHCredentials } from 'n8n-workflow';
+import { Client } from 'ssh2';
+
 import { SSHClientsManager } from '@/SSHClientsManager';
 
 describe('SSHClientsManager', () => {
diff --git a/packages/core/test/ScheduledTaskManager.test.ts b/packages/core/test/ScheduledTaskManager.test.ts
index 15d5f7d487..5166240856 100644
--- a/packages/core/test/ScheduledTaskManager.test.ts
+++ b/packages/core/test/ScheduledTaskManager.test.ts
@@ -1,5 +1,5 @@
-import type { Workflow } from 'n8n-workflow';
 import { mock } from 'jest-mock-extended';
+import type { Workflow } from 'n8n-workflow';
 
 import type { InstanceSettings } from '@/InstanceSettings';
 import { ScheduledTaskManager } from '@/ScheduledTaskManager';
@@ -56,8 +56,13 @@ describe('ScheduledTaskManager', () => {
 		scheduledTaskManager.registerCron(workflow, everyMinute, onTick);
 		scheduledTaskManager.registerCron(workflow, everyMinute, onTick);
 		scheduledTaskManager.registerCron(workflow, everyMinute, onTick);
+
+		expect(scheduledTaskManager.cronJobs.get(workflow.id)?.length).toBe(3);
+
 		scheduledTaskManager.deregisterCrons(workflow.id);
 
+		expect(scheduledTaskManager.cronJobs.get(workflow.id)?.length).toBe(0);
+
 		expect(onTick).not.toHaveBeenCalled();
 		jest.advanceTimersByTime(10 * 60 * 1000); // 10 minutes
 		expect(onTick).not.toHaveBeenCalled();
diff --git a/packages/core/test/Validation.test.ts b/packages/core/test/Validation.test.ts
index a19422a090..04ad3c134e 100644
--- a/packages/core/test/Validation.test.ts
+++ b/packages/core/test/Validation.test.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, INode, INodeType } from 'n8n-workflow';
+
 import { validateValueAgainstSchema } from '@/NodeExecuteFunctions';
 
 describe('Validation', () => {
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index d14a4e3fd1..6d1927fb88 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -5,6 +5,7 @@ import {
 	NodeExecutionOutput,
 	Workflow,
 } from 'n8n-workflow';
+
 import { WorkflowExecute } from '@/WorkflowExecute';
 
 import * as Helpers from './helpers';
diff --git a/packages/core/test/WorkflowExecutionMetadata.test.ts b/packages/core/test/WorkflowExecutionMetadata.test.ts
index cdb50c9737..63d0892e6a 100644
--- a/packages/core/test/WorkflowExecutionMetadata.test.ts
+++ b/packages/core/test/WorkflowExecutionMetadata.test.ts
@@ -1,3 +1,6 @@
+import type { IRunExecutionData } from 'n8n-workflow';
+
+import { InvalidExecutionMetadataError } from '@/errors/invalid-execution-metadata.error';
 import {
 	setWorkflowExecutionMetadata,
 	setAllWorkflowExecutionMetadata,
@@ -5,8 +8,6 @@ import {
 	getWorkflowExecutionMetadata,
 	getAllWorkflowExecutionMetadata,
 } from '@/ExecutionMetadata';
-import { InvalidExecutionMetadataError } from '@/errors/invalid-execution-metadata.error';
-import type { IRunExecutionData } from 'n8n-workflow';
 
 describe('Execution Metadata functions', () => {
 	test('setWorkflowExecutionMetadata will set a value', () => {
diff --git a/packages/core/test/helpers/constants.ts b/packages/core/test/helpers/constants.ts
index 70819478ad..f3de1c667c 100644
--- a/packages/core/test/helpers/constants.ts
+++ b/packages/core/test/helpers/constants.ts
@@ -5,6 +5,7 @@ import type {
 	WorkflowTestData,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { If } from '../../../nodes-base/dist/nodes/If/If.node';
 import { Merge } from '../../../nodes-base/dist/nodes/Merge/Merge.node';
 import { NoOp } from '../../../nodes-base/dist/nodes/NoOp/NoOp.node';
diff --git a/packages/core/test/helpers/index.ts b/packages/core/test/helpers/index.ts
index 5f935ef850..5f0858ea41 100644
--- a/packages/core/test/helpers/index.ts
+++ b/packages/core/test/helpers/index.ts
@@ -1,8 +1,5 @@
-import path from 'path';
 import { readdirSync, readFileSync } from 'fs';
-
-const BASE_DIR = path.resolve(__dirname, '../../..');
-
+import { mock } from 'jest-mock-extended';
 import type {
 	IDataObject,
 	IDeferredPromise,
@@ -17,11 +14,12 @@ import type {
 	WorkflowTestData,
 	INodeTypeData,
 } from 'n8n-workflow';
-
 import { ApplicationError, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
+import path from 'path';
 
 import { predefinedNodesTypes } from './constants';
-import { mock } from 'jest-mock-extended';
+
+const BASE_DIR = path.resolve(__dirname, '../../..');
 
 class NodeTypesClass implements INodeTypes {
 	constructor(private nodeTypes: INodeTypeData = predefinedNodesTypes) {}
diff --git a/packages/core/test/utils.ts b/packages/core/test/utils.ts
index 8895875240..7f4862cabd 100644
--- a/packages/core/test/utils.ts
+++ b/packages/core/test/utils.ts
@@ -1,8 +1,8 @@
-import { Container } from 'typedi';
 import { mock } from 'jest-mock-extended';
 import { Duplex } from 'stream';
-
 import type { DeepPartial } from 'ts-essentials';
+import { Container } from 'typedi';
+
 import type { Class } from '@/Interfaces';
 
 export const mockInstance = <T>(
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 526a9e43c4..36fcf31528 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.51.0",
+  "version": "1.53.0",
   "main": "src/main.ts",
   "import": "src/main.ts",
   "scripts": {
diff --git a/packages/design-system/src/__tests__/render.ts b/packages/design-system/src/__tests__/render.ts
new file mode 100644
index 0000000000..afe27e6855
--- /dev/null
+++ b/packages/design-system/src/__tests__/render.ts
@@ -0,0 +1,20 @@
+import { render } from '@testing-library/vue';
+
+import { N8nPlugin } from 'n8n-design-system/plugin';
+
+type Component = Parameters<typeof render>[0];
+type RenderOptions = Parameters<typeof render>[1];
+
+export const createComponentRenderer = (component: Component) => (options: RenderOptions) => {
+	const mergedOptions: RenderOptions = {
+		...options,
+		global: {
+			...(options?.global ?? {}),
+			stubs: {
+				...(options?.global?.stubs ?? {}),
+			},
+			plugins: [N8nPlugin, ...(options?.global?.plugins ?? [])],
+		},
+	};
+	return render(component, mergedOptions);
+};
diff --git a/packages/design-system/src/__tests__/setup.ts b/packages/design-system/src/__tests__/setup.ts
index 3ad85f014a..6eb1c426fc 100644
--- a/packages/design-system/src/__tests__/setup.ts
+++ b/packages/design-system/src/__tests__/setup.ts
@@ -4,3 +4,11 @@ import { config } from '@vue/test-utils';
 import { N8nPlugin } from 'n8n-design-system/plugin';
 
 config.global.plugins = [N8nPlugin];
+
+window.ResizeObserver =
+	window.ResizeObserver ||
+	vi.fn().mockImplementation(() => ({
+		disconnect: vi.fn(),
+		observe: vi.fn(),
+		unobserve: vi.fn(),
+	}));
diff --git a/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts b/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
index 8977df997a..b4b7d281a5 100644
--- a/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
+++ b/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
@@ -4,21 +4,26 @@ import { n8nHtml } from 'n8n-design-system/directives';
 
 import AskAssistantChat from '../AskAssistantChat.vue';
 
+const stubs = ['n8n-avatar', 'n8n-button', 'n8n-icon', 'n8n-icon-button'];
+
 describe('AskAssistantChat', () => {
 	it('renders default placeholder chat correctly', () => {
 		const { container } = render(AskAssistantChat, {
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
 			},
+			global: { stubs },
 		});
 		expect(container).toMatchSnapshot();
 	});
+
 	it('renders chat with messages correctly', () => {
 		const { container } = render(AskAssistantChat, {
 			global: {
 				directives: {
 					n8nHtml,
 				},
+				stubs,
 			},
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
@@ -92,12 +97,14 @@ describe('AskAssistantChat', () => {
 		});
 		expect(container).toMatchSnapshot();
 	});
+
 	it('renders streaming chat correctly', () => {
 		const { container } = render(AskAssistantChat, {
 			global: {
 				directives: {
 					n8nHtml,
 				},
+				stubs,
 			},
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
@@ -116,12 +123,14 @@ describe('AskAssistantChat', () => {
 		});
 		expect(container).toMatchSnapshot();
 	});
+
 	it('renders end of session chat correctly', () => {
 		const { container } = render(AskAssistantChat, {
 			global: {
 				directives: {
 					n8nHtml,
 				},
+				stubs,
 			},
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
@@ -146,12 +155,14 @@ describe('AskAssistantChat', () => {
 		});
 		expect(container).toMatchSnapshot();
 	});
+
 	it('renders message with code snippet', () => {
 		const { container } = render(AskAssistantChat, {
 			global: {
 				directives: {
 					n8nHtml,
 				},
+				stubs,
 			},
 			props: {
 				user: { firstName: 'Kobi', lastName: 'Dog' },
diff --git a/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap b/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap
index b3cfeff42a..79b57d2d17 100644
--- a/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap
+++ b/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap
@@ -64,7 +64,7 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
         class="back"
         data-test-id="close-chat-button"
       >
-        <n8n-icon
+        <n8n-icon-stub
           color="text-base"
           icon="arrow-right"
         />
@@ -400,16 +400,14 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
               <div
                 class="actions"
               >
-                <n8n-button
+                <n8n-button-stub
                   data-test-id="replace-code-button"
                   disabled="false"
                   icon="refresh"
                   loading="false"
                   size="mini"
                   type="primary"
-                >
-                  Replace my code
-                </n8n-button>
+                />
               </div>
             </div>
           </div>
@@ -422,7 +420,7 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
           <div
             class="roleName userSection"
           >
-            <n8n-avatar
+            <n8n-avatar-stub
               first-name="Kobi"
               last-name="Dog"
               size="xsmall"
@@ -683,16 +681,14 @@ Testing more code
               <div
                 class="actions"
               >
-                <n8n-button
+                <n8n-button-stub
                   data-test-id="replace-code-button"
                   disabled="false"
                   icon="refresh"
                   loading="false"
                   size="mini"
                   type="primary"
-                >
-                  Replace my code
-                </n8n-button>
+                />
               </div>
             </div>
           </div>
@@ -708,22 +704,18 @@ Testing more code
             <div
               data-test-id="quick-replies"
             >
-              <n8n-button
+              <n8n-button-stub
                 size="mini"
                 type="secondary"
-              >
-                Give me another solution
-              </n8n-button>
+              />
             </div>
             <div
               data-test-id="quick-replies"
             >
-              <n8n-button
+              <n8n-button-stub
                 size="mini"
                 type="secondary"
-              >
-                All good
-              </n8n-button>
+              />
             </div>
             
           </div>
@@ -742,7 +734,7 @@ Testing more code
         rows="1"
         wrap="hard"
       />
-      <n8n-icon-button
+      <n8n-icon-button-stub
         class="sendButton"
         data-test-id="send-message-button"
         disabled="true"
@@ -819,7 +811,7 @@ exports[`AskAssistantChat > renders default placeholder chat correctly 1`] = `
         class="back"
         data-test-id="close-chat-button"
       >
-        <n8n-icon
+        <n8n-icon-stub
           color="text-base"
           icon="arrow-right"
         />
@@ -916,7 +908,7 @@ exports[`AskAssistantChat > renders default placeholder chat correctly 1`] = `
         rows="1"
         wrap="hard"
       />
-      <n8n-icon-button
+      <n8n-icon-button-stub
         class="sendButton"
         data-test-id="send-message-button"
         disabled="true"
@@ -993,7 +985,7 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
         class="back"
         data-test-id="close-chat-button"
       >
-        <n8n-icon
+        <n8n-icon-stub
           color="text-base"
           icon="arrow-right"
         />
@@ -1161,7 +1153,7 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
         rows="1"
         wrap="hard"
       />
-      <n8n-icon-button
+      <n8n-icon-button-stub
         class="sendButton"
         data-test-id="send-message-button"
         disabled="true"
@@ -1238,7 +1230,7 @@ exports[`AskAssistantChat > renders message with code snippet 1`] = `
         class="back"
         data-test-id="close-chat-button"
       >
-        <n8n-icon
+        <n8n-icon-stub
           color="text-base"
           icon="arrow-right"
         />
@@ -1405,7 +1397,7 @@ catch(e) {
         rows="1"
         wrap="hard"
       />
-      <n8n-icon-button
+      <n8n-icon-button-stub
         class="sendButton"
         data-test-id="send-message-button"
         disabled="true"
@@ -1482,7 +1474,7 @@ exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
         class="back"
         data-test-id="close-chat-button"
       >
-        <n8n-icon
+        <n8n-icon-stub
           color="text-base"
           icon="arrow-right"
         />
@@ -1581,7 +1573,7 @@ exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
         rows="1"
         wrap="hard"
       />
-      <n8n-icon-button
+      <n8n-icon-button-stub
         class="sendButton"
         data-test-id="send-message-button"
         disabled="true"
diff --git a/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts b/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts
index c92a15efeb..d23d49d6d1 100644
--- a/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts
+++ b/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts
@@ -2,6 +2,8 @@ import { render } from '@testing-library/vue';
 
 import CodeDiff from '../CodeDiff.vue';
 
+const stubs = ['n8n-button', 'n8n-icon'];
+
 describe('CodeDiff', () => {
 	it('renders code diff correctly', () => {
 		const { container } = render(CodeDiff, {
@@ -10,9 +12,11 @@ describe('CodeDiff', () => {
 				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 ",
 			},
+			global: { stubs },
 		});
 		expect(container).toMatchSnapshot();
 	});
+
 	it('renders replaced code diff correctly', () => {
 		const { container } = render(CodeDiff, {
 			props: {
@@ -21,9 +25,11 @@ describe('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!',
 				replaced: true,
 			},
+			global: { stubs },
 		});
 		expect(container).toMatchSnapshot();
 	});
+
 	it('renders replacing code diff correctly', () => {
 		const { container } = render(CodeDiff, {
 			props: {
@@ -32,9 +38,11 @@ describe('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!',
 				replacing: true,
 			},
+			global: { stubs },
 		});
 		expect(container).toMatchSnapshot();
 	});
+
 	it('renders error state correctly', () => {
 		const { container } = render(CodeDiff, {
 			props: {
@@ -43,6 +51,7 @@ describe('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!',
 				error: true,
 			},
+			global: { stubs },
 		});
 		expect(container).toMatchSnapshot();
 	});
diff --git a/packages/design-system/src/components/CodeDiff/__tests__/__snapshots__/CodeDiff.spec.ts.snap b/packages/design-system/src/components/CodeDiff/__tests__/__snapshots__/CodeDiff.spec.ts.snap
index 97fc21bf5a..0810f24767 100644
--- a/packages/design-system/src/components/CodeDiff/__tests__/__snapshots__/CodeDiff.spec.ts.snap
+++ b/packages/design-system/src/components/CodeDiff/__tests__/__snapshots__/CodeDiff.spec.ts.snap
@@ -270,16 +270,14 @@ exports[`CodeDiff > renders code diff correctly 1`] = `
     <div
       class="actions"
     >
-      <n8n-button
+      <n8n-button-stub
         data-test-id="replace-code-button"
         disabled="false"
         icon="refresh"
         loading="false"
         size="mini"
         type="primary"
-      >
-        Replace my code
-      </n8n-button>
+      />
     </div>
   </div>
 </div>
@@ -535,7 +533,7 @@ exports[`CodeDiff > renders error state correctly 1`] = `
       class="actions"
     >
       <div>
-        <n8n-icon
+        <n8n-icon-stub
           class="mr-5xs"
           color="danger"
           icon="exclamation-triangle"
@@ -801,15 +799,13 @@ exports[`CodeDiff > renders replaced code diff correctly 1`] = `
       class="actions"
     >
       <div>
-        <n8n-button
+        <n8n-button-stub
           data-test-id="undo-replace-button"
           icon="undo"
           size="mini"
           type="secondary"
-        >
-          Undo
-        </n8n-button>
-        <n8n-icon
+        />
+        <n8n-icon-stub
           class="ml-xs"
           color="success"
           icon="check"
@@ -1075,16 +1071,14 @@ exports[`CodeDiff > renders replacing code diff correctly 1`] = `
     <div
       class="actions"
     >
-      <n8n-button
+      <n8n-button-stub
         data-test-id="replace-code-button"
         disabled="false"
         icon="refresh"
         loading="true"
         size="mini"
         type="secondary"
-      >
-        Replacing...
-      </n8n-button>
+      />
     </div>
   </div>
 </div>
diff --git a/packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts b/packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts
new file mode 100644
index 0000000000..a309e1aa40
--- /dev/null
+++ b/packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts
@@ -0,0 +1,57 @@
+import { createComponentRenderer } from '../../../__tests__/render';
+import FormBox from '../FormBox.vue';
+
+const render = createComponentRenderer(FormBox);
+
+describe('FormBox', () => {
+	it('should render the component', () => {
+		const { container } = render({
+			props: {
+				title: 'Title',
+				inputs: [
+					{
+						name: 'name',
+						properties: {
+							label: 'Name',
+							type: 'text',
+							required: true,
+							showRequiredAsterisk: true,
+							validateOnBlur: false,
+							autocomplete: 'email',
+							capitalize: true,
+							labelSize: 'small',
+							tagSize: 'small',
+						},
+					},
+					{
+						name: 'email',
+						properties: {
+							label: 'Email',
+							type: 'email',
+							required: true,
+							showRequiredAsterisk: true,
+							validateOnBlur: false,
+							autocomplete: 'email',
+							capitalize: true,
+							labelSize: 'medium',
+							tagSize: 'medium',
+						},
+					},
+					{
+						name: 'password',
+						properties: {
+							label: 'Password',
+							type: 'password',
+							required: true,
+							showRequiredAsterisk: true,
+							validateOnBlur: false,
+							autocomplete: 'current-password',
+							capitalize: true,
+						},
+					},
+				],
+			},
+		});
+		expect(container).toMatchSnapshot();
+	});
+});
diff --git a/packages/design-system/src/components/N8nFormBox/__tests__/__snapshots__/FormBox.test.ts.snap b/packages/design-system/src/components/N8nFormBox/__tests__/__snapshots__/FormBox.test.ts.snap
new file mode 100644
index 0000000000..8138b44b8c
--- /dev/null
+++ b/packages/design-system/src/components/N8nFormBox/__tests__/__snapshots__/FormBox.test.ts.snap
@@ -0,0 +1,259 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`FormBox > should render the component 1`] = `
+<div>
+  <div
+    class="n8n-form-box container"
+  >
+    <div
+      class="heading"
+    >
+      <span
+        class="n8n-heading size-xlarge regular"
+      >
+        
+        Title
+        
+      </span>
+    </div>
+    <div
+      class="inputsContainer"
+    >
+      <div>
+        
+        <div
+          class="grid"
+        >
+          
+          <div
+            class=""
+          >
+            <div
+              capitalize="true"
+              class="container"
+              data-test-id="name"
+            >
+              <label
+                class="n8n-input-label inputLabel heading small"
+                for="name"
+              >
+                <div
+                  class="title"
+                >
+                  <span
+                    class="n8n-text size-small bold"
+                  >
+                    
+                    Name 
+                    <span
+                      class="n8n-text primary size-small bold"
+                    >
+                      
+                      *
+                      
+                    </span>
+                    
+                  </span>
+                </div>
+                <!--v-if-->
+                <!--v-if-->
+                <!--v-if-->
+              </label>
+              
+              <div
+                class=""
+              >
+                <div
+                  class="el-input el-input--small n8n-input"
+                >
+                  <!-- input -->
+                  
+                  <!-- prepend slot -->
+                  <!--v-if-->
+                  <div
+                    class="el-input__wrapper"
+                  >
+                    <!-- prefix slot -->
+                    <!--v-if-->
+                    <input
+                      autocomplete="email"
+                      class="el-input__inner"
+                      name="name"
+                      placeholder=""
+                      rows="2"
+                      tabindex="0"
+                      title=""
+                      type="text"
+                    />
+                    <!-- suffix slot -->
+                    <!--v-if-->
+                  </div>
+                  <!-- append slot -->
+                  <!--v-if-->
+                  
+                </div>
+              </div>
+              <!--v-if-->
+              
+            </div>
+          </div>
+          <div
+            class=""
+          >
+            <div
+              capitalize="true"
+              class="container"
+              data-test-id="email"
+            >
+              <label
+                class="n8n-input-label inputLabel heading medium"
+                for="email"
+              >
+                <div
+                  class="title"
+                >
+                  <span
+                    class="n8n-text size-medium bold"
+                  >
+                    
+                    Email 
+                    <span
+                      class="n8n-text primary size-medium bold"
+                    >
+                      
+                      *
+                      
+                    </span>
+                    
+                  </span>
+                </div>
+                <!--v-if-->
+                <!--v-if-->
+                <!--v-if-->
+              </label>
+              
+              <div
+                class=""
+              >
+                <div
+                  class="el-input el-input--default n8n-input"
+                >
+                  <!-- input -->
+                  
+                  <!-- prepend slot -->
+                  <!--v-if-->
+                  <div
+                    class="el-input__wrapper"
+                  >
+                    <!-- prefix slot -->
+                    <!--v-if-->
+                    <input
+                      autocomplete="email"
+                      class="el-input__inner"
+                      name="email"
+                      placeholder=""
+                      rows="2"
+                      tabindex="0"
+                      title=""
+                      type="email"
+                    />
+                    <!-- suffix slot -->
+                    <!--v-if-->
+                  </div>
+                  <!-- append slot -->
+                  <!--v-if-->
+                  
+                </div>
+              </div>
+              <!--v-if-->
+              
+            </div>
+          </div>
+          <div
+            class=""
+          >
+            <div
+              capitalize="true"
+              class="container"
+              data-test-id="password"
+            >
+              <label
+                class="n8n-input-label inputLabel heading medium"
+                for="password"
+              >
+                <div
+                  class="title"
+                >
+                  <span
+                    class="n8n-text size-medium bold"
+                  >
+                    
+                    Password 
+                    <span
+                      class="n8n-text primary size-medium bold"
+                    >
+                      
+                      *
+                      
+                    </span>
+                    
+                  </span>
+                </div>
+                <!--v-if-->
+                <!--v-if-->
+                <!--v-if-->
+              </label>
+              
+              <div
+                class=""
+              >
+                <div
+                  class="el-input el-input--large n8n-input ph-no-capture"
+                >
+                  <!-- input -->
+                  
+                  <!-- prepend slot -->
+                  <!--v-if-->
+                  <div
+                    class="el-input__wrapper"
+                  >
+                    <!-- prefix slot -->
+                    <!--v-if-->
+                    <input
+                      autocomplete="current-password"
+                      class="el-input__inner"
+                      name="password"
+                      placeholder=""
+                      rows="2"
+                      tabindex="0"
+                      title=""
+                      type="password"
+                    />
+                    <!-- suffix slot -->
+                    <!--v-if-->
+                  </div>
+                  <!-- append slot -->
+                  <!--v-if-->
+                  
+                </div>
+              </div>
+              <!--v-if-->
+              
+            </div>
+          </div>
+          
+        </div>
+        
+      </div>
+    </div>
+    <!--v-if-->
+    <div
+      class="actionContainer"
+    >
+      <!--v-if-->
+    </div>
+    
+    
+  </div>
+</div>
+`;
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index b1fbd4b6e3..b50868a303 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -49,7 +49,7 @@ export interface Props {
 	inactiveLabel?: string;
 	inactiveColor?: string;
 	teleported?: boolean;
-	tagSize?: 'small' | 'medium';
+	tagSize?: 'small' | 'medium' | 'large';
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -59,7 +59,7 @@ const props = withDefaults(defineProps<Props>(), {
 	showRequiredAsterisk: true,
 	validateOnBlur: true,
 	teleported: true,
-	tagSize: 'small',
+	tagSize: 'large',
 });
 
 const emit = defineEmits<{
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 8a27b28137..261663de32 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -13,7 +13,6 @@ export type FormInputsProps = {
 	columnView?: boolean;
 	verticalSpacing?: '' | 'xs' | 's' | 'm' | 'l' | 'xl';
 	teleported?: boolean;
-	tagSize?: 'small' | 'medium';
 };
 
 type Value = string | number | boolean | null | undefined;
@@ -24,7 +23,6 @@ const props = withDefaults(defineProps<FormInputsProps>(), {
 	columnView: false,
 	verticalSpacing: '',
 	teleported: true,
-	tagSize: 'small',
 });
 
 const emit = defineEmits<{
@@ -129,7 +127,6 @@ onMounted(() => {
 						:data-test-id="input.name"
 						:show-validation-warnings="showValidationWarnings"
 						:teleported="teleported"
-						:tag-size="tagSize"
 						@update:model-value="(value: Value) => onUpdateModelValue(input.name, value)"
 						@validate="(value: boolean) => onValidate(input.name, value)"
 						@enter="onSubmit"
diff --git a/packages/design-system/src/components/N8nInput/Input.vue b/packages/design-system/src/components/N8nInput/Input.vue
index 39cda6ce30..776b0bf7c8 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/design-system/src/components/N8nInput/Input.vue
@@ -39,7 +39,7 @@ const props = withDefaults(defineProps<InputProps>(), {
 });
 
 const resolvedSize = computed(
-	() => (props.size === 'xlarge' ? undefined : props.size) as ElementPlusSizePropType,
+	() => (props.size === 'medium' ? 'default' : props.size) as ElementPlusSizePropType,
 );
 
 const classes = computed(() => {
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index 4a89233bf1..e522579713 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -33,7 +33,14 @@ const addTargetBlank = (html: string) =>
 </script>
 
 <template>
-	<div :class="$style.container" v-bind="$attrs" data-test-id="input-label">
+	<div
+		:class="{
+			[$style.container]: true,
+			[$style.withOptions]: $slots.options,
+		}"
+		v-bind="$attrs"
+		data-test-id="input-label"
+	>
 		<label
 			v-if="label || $slots.options"
 			:for="inputName"
@@ -47,7 +54,15 @@ const addTargetBlank = (html: string) =>
 			}"
 		>
 			<div v-if="label" :class="$style.title">
-				<N8nText :bold="bold" :size="size" :compact="compact" :color="color">
+				<N8nText
+					:bold="bold"
+					:size="size"
+					:compact="compact"
+					:color="color"
+					:class="{
+						[$style.textEllipses]: showOptions,
+					}"
+				>
 					{{ label }}
 					<N8nText v-if="required" color="primary" :bold="bold" :size="size">*</N8nText>
 				</N8nText>
@@ -107,6 +122,12 @@ const addTargetBlank = (html: string) =>
 		transition: opacity 100ms ease-in; // transition on hover in
 	}
 }
+.withOptions:hover {
+	.title > span {
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+}
 
 .title {
 	display: flex;
@@ -170,6 +191,11 @@ const addTargetBlank = (html: string) =>
 	overflow-y: clip;
 }
 
+.textEllipses {
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
 .heading {
 	display: flex;
 
diff --git a/packages/design-system/src/components/N8nInputLabel/__tests__/InputLabel.spec.ts b/packages/design-system/src/components/N8nInputLabel/__tests__/InputLabel.spec.ts
new file mode 100644
index 0000000000..ab46c89e12
--- /dev/null
+++ b/packages/design-system/src/components/N8nInputLabel/__tests__/InputLabel.spec.ts
@@ -0,0 +1,32 @@
+import { render } from '@testing-library/vue';
+
+import InputLabel from '../InputLabel.vue';
+
+describe('component', () => {
+	describe('Text overflow behavior', () => {
+		it('displays full text without options', () => {
+			const { container } = render(InputLabel, {
+				props: {
+					label: 'a label',
+				},
+			});
+
+			expect(container.querySelectorAll('.textEllipses').length).eq(0);
+
+			expect(container).toMatchSnapshot();
+		});
+
+		it('displays ellipsis with options', () => {
+			const { container } = render(InputLabel, {
+				props: {
+					label: 'a label',
+					showOptions: true,
+				},
+			});
+
+			expect(container.querySelectorAll('.textEllipses').length).eq(1);
+
+			expect(container).toMatchSnapshot();
+		});
+	});
+});
diff --git a/packages/design-system/src/components/N8nInputLabel/__tests__/__snapshots__/InputLabel.spec.ts.snap b/packages/design-system/src/components/N8nInputLabel/__tests__/__snapshots__/InputLabel.spec.ts.snap
new file mode 100644
index 0000000000..b4b61558a4
--- /dev/null
+++ b/packages/design-system/src/components/N8nInputLabel/__tests__/__snapshots__/InputLabel.spec.ts.snap
@@ -0,0 +1,63 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`component > Text overflow behavior > displays ellipsis with options 1`] = `
+<div>
+  <div
+    class="container"
+    data-test-id="input-label"
+  >
+    <label
+      class="n8n-input-label inputLabel heading medium"
+    >
+      <div
+        class="title"
+      >
+        <span
+          class="n8n-text size-medium bold textEllipses textEllipses"
+        >
+          
+          a label 
+          <!--v-if-->
+          
+        </span>
+      </div>
+      <!--v-if-->
+      <!--v-if-->
+      <!--v-if-->
+    </label>
+    
+    
+  </div>
+</div>
+`;
+
+exports[`component > Text overflow behavior > displays full text without options 1`] = `
+<div>
+  <div
+    class="container"
+    data-test-id="input-label"
+  >
+    <label
+      class="n8n-input-label inputLabel heading medium"
+    >
+      <div
+        class="title"
+      >
+        <span
+          class="n8n-text size-medium bold"
+        >
+          
+          a label 
+          <!--v-if-->
+          
+        </span>
+      </div>
+      <!--v-if-->
+      <!--v-if-->
+      <!--v-if-->
+    </label>
+    
+    
+  </div>
+</div>
+`;
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
index 7f55c0c6f1..1074d584bf 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.vue
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
@@ -136,7 +136,7 @@ const htmlContent = computed(() => {
 });
 
 const emit = defineEmits<{
-	'markdown-click': [link: string, e: MouseEvent];
+	'markdown-click': [link: HTMLAnchorElement, e: MouseEvent];
 	'update-content': [content: string];
 }>();
 
@@ -154,7 +154,7 @@ const onClick = (event: MouseEvent) => {
 		}
 	}
 	if (clickedLink) {
-		emit('markdown-click', clickedLink?.href, event);
+		emit('markdown-click', clickedLink, event);
 	}
 };
 
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.stories.ts b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.stories.ts
new file mode 100644
index 0000000000..6951cfc365
--- /dev/null
+++ b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.stories.ts
@@ -0,0 +1,63 @@
+import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+
+import NavigationDropdown from './NavigationDropdown.vue';
+
+export default {
+	title: 'Atoms/NavigationDropdown',
+	component: NavigationDropdown,
+	argTypes: {},
+};
+
+const methods = {
+	onSelect: action('select'),
+};
+
+const template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		NavigationDropdown,
+	},
+	template: `
+		<div style="height: 10vh; width: 200px">
+			<n8n-navigation-dropdown v-bind="args" @select="onSelect">
+				<button type="button">trigger</button>
+			</n8n-navigation-dropdown>
+		</div>
+	`,
+	methods,
+});
+
+const menuItems = [
+	{
+		id: 'credentials',
+		title: 'Credentials',
+		submenu: [
+			{
+				id: 'credentials-0',
+				title: 'Create',
+				disabled: true,
+			},
+			{
+				id: 'credentials-1',
+				title: 'Credentials - 1',
+				icon: 'user',
+			},
+			{
+				id: 'credentials-2',
+				title: 'Credentials - 2',
+				icon: 'user',
+			},
+		],
+	},
+	{
+		id: 'variables',
+		title: 'Variables',
+	},
+];
+
+export const primary = template.bind({});
+primary.args = {
+	menu: menuItems,
+};
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
new file mode 100644
index 0000000000..7657d73211
--- /dev/null
+++ b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
@@ -0,0 +1,127 @@
+<script setup lang="ts">
+import { ElMenu, ElSubMenu, ElMenuItem, type MenuItemRegistered } from 'element-plus';
+import type { RouteLocationRaw } from 'vue-router';
+
+import ConditionalRouterLink from '../ConditionalRouterLink';
+import N8nIcon from '../N8nIcon';
+
+type BaseItem = {
+	id: string;
+	title: string;
+	disabled?: boolean;
+	icon?: string;
+	route?: RouteLocationRaw;
+};
+
+type Item = BaseItem & {
+	submenu?: BaseItem[];
+};
+
+defineProps<{
+	menu: Item[];
+}>();
+
+const emit = defineEmits<{
+	itemClick: [item: MenuItemRegistered];
+	select: [id: Item['id']];
+}>();
+</script>
+
+<template>
+	<ElMenu
+		mode="horizontal"
+		:ellipsis="false"
+		:class="$style.dropdown"
+		@select="emit('select', $event)"
+	>
+		<ElSubMenu
+			index="-1"
+			:class="$style.trigger"
+			:popper-offset="-10"
+			:popper-class="$style.submenu"
+		>
+			<template #title>
+				<slot />
+			</template>
+
+			<template v-for="item in menu" :key="item.id">
+				<template v-if="item.submenu">
+					<ElSubMenu :index="item.id" :popper-offset="-10" data-test-id="navigation-submenu">
+						<template #title>{{ item.title }}</template>
+						<template v-for="subitem in item.submenu" :key="subitem.id">
+							<ConditionalRouterLink :to="subitem.route">
+								<ElMenuItem
+									data-test-id="navigation-submenu-item"
+									:index="subitem.id"
+									:disabled="subitem.disabled"
+									@click="emit('itemClick', $event)"
+								>
+									<N8nIcon v-if="subitem.icon" :icon="subitem.icon" :class="$style.submenu__icon" />
+									{{ subitem.title }}
+								</ElMenuItem>
+							</ConditionalRouterLink>
+						</template>
+					</ElSubMenu>
+				</template>
+				<ConditionalRouterLink v-else :to="item.route">
+					<ElMenuItem
+						:index="item.id"
+						:disabled="item.disabled"
+						data-test-id="navigation-menu-item"
+					>
+						{{ item.title }}
+					</ElMenuItem>
+				</ConditionalRouterLink>
+			</template>
+		</ElSubMenu>
+	</ElMenu>
+</template>
+
+<style lang="scss" module>
+:global(.el-menu).dropdown {
+	border-bottom: 0;
+	background-color: transparent;
+}
+
+:global(.el-sub-menu).trigger {
+	:global(.el-sub-menu__title) {
+		height: auto;
+		line-height: initial;
+		border-bottom: 0 !important;
+		:global(.el-sub-menu__icon-arrow) {
+			display: none;
+		}
+	}
+
+	:global(.el-sub-menu__title:hover) {
+		background-color: transparent;
+	}
+}
+
+.submenu {
+	:global(.el-menu--horizontal .el-menu .el-menu-item),
+	:global(.el-menu--horizontal .el-menu .el-sub-menu__title) {
+		color: var(--color-text-dark);
+	}
+
+	:global(.el-menu--horizontal .el-menu .el-menu-item:not(.is-disabled):hover),
+	:global(.el-menu--horizontal .el-menu .el-sub-menu__title:not(.is-disabled):hover) {
+		background-color: var(--color-foreground-base);
+	}
+
+	:global(.el-menu--horizontal .el-menu .el-menu-item.is-disabled) {
+		opacity: 1;
+		cursor: default;
+		color: var(--color-text-light);
+	}
+
+	:global(.el-sub-menu__icon-arrow svg) {
+		margin-top: auto;
+	}
+}
+
+.submenu__icon {
+	margin-right: var(--spacing-2xs);
+	color: var(--color-text-base);
+}
+</style>
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/__tests__/NavigationDropdown.spec.ts b/packages/design-system/src/components/N8nNavigationDropdown/__tests__/NavigationDropdown.spec.ts
new file mode 100644
index 0000000000..465f1f0c2b
--- /dev/null
+++ b/packages/design-system/src/components/N8nNavigationDropdown/__tests__/NavigationDropdown.spec.ts
@@ -0,0 +1,120 @@
+import userEvent from '@testing-library/user-event';
+import { configure, render, waitFor } from '@testing-library/vue';
+import { h } from 'vue';
+import { createRouter, createWebHistory } from 'vue-router';
+
+import NavigationDropdown from '../NavigationDropdown.vue';
+
+configure({ testIdAttribute: 'data-test-id' });
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/',
+			name: 'home',
+			redirect: '/home',
+		},
+		{
+			path: '/projects',
+			name: 'projects',
+			component: { template: '<h1>projects</h1>' },
+		},
+	],
+});
+
+describe('N8nNavigationDropdown', () => {
+	beforeAll(async () => {
+		await router.push('/');
+
+		await router.isReady();
+	});
+	it('default slot should trigger first level', async () => {
+		const { getByTestId, queryByTestId } = render(NavigationDropdown, {
+			slots: { default: h('button', { ['data-test-id']: 'test-trigger' }) },
+			props: { menu: [{ id: 'aaa', title: 'aaa', route: { name: 'projects' } }] },
+			global: {
+				plugins: [router],
+			},
+		});
+		expect(getByTestId('test-trigger')).toBeVisible();
+		expect(queryByTestId('navigation-menu-item')).not.toBeVisible();
+
+		await userEvent.hover(getByTestId('test-trigger'));
+		await waitFor(() => expect(queryByTestId('navigation-menu-item')).toBeVisible());
+	});
+
+	it('redirect to route', async () => {
+		const { getByTestId, queryByTestId } = render(NavigationDropdown, {
+			slots: { default: h('button', { ['data-test-id']: 'test-trigger' }) },
+			props: {
+				menu: [
+					{
+						id: 'aaa',
+						title: 'aaa',
+						submenu: [{ id: 'bbb', title: 'bbb', route: { name: 'projects' } }],
+					},
+				],
+			},
+			global: {
+				plugins: [router],
+			},
+		});
+
+		expect(getByTestId('test-trigger')).toBeVisible();
+		expect(queryByTestId('navigation-submenu')).not.toBeVisible();
+
+		await userEvent.hover(getByTestId('test-trigger'));
+
+		await waitFor(() => expect(getByTestId('navigation-submenu')).toBeVisible());
+
+		await userEvent.click(getByTestId('navigation-submenu-item'));
+
+		expect(router.currentRoute.value.name).toBe('projects');
+	});
+
+	it('should render icons in submenu when provided', () => {
+		const { getByTestId } = render(NavigationDropdown, {
+			slots: { default: h('button', { ['data-test-id']: 'test-trigger' }) },
+			props: {
+				menu: [
+					{
+						id: 'aaa',
+						title: 'aaa',
+						submenu: [{ id: 'bbb', title: 'bbb', route: { name: 'projects' }, icon: 'user' }],
+					},
+				],
+			},
+			global: {
+				plugins: [router],
+			},
+		});
+
+		expect(getByTestId('navigation-submenu-item').querySelector('.submenu__icon')).toBeTruthy();
+	});
+
+	it('should propagate events', async () => {
+		const { getByTestId, emitted } = render(NavigationDropdown, {
+			slots: { default: h('button', { ['data-test-id']: 'test-trigger' }) },
+			props: {
+				menu: [
+					{
+						id: 'aaa',
+						title: 'aaa',
+						submenu: [{ id: 'bbb', title: 'bbb', route: { name: 'projects' }, icon: 'user' }],
+					},
+				],
+			},
+			global: {
+				plugins: [router],
+			},
+		});
+
+		await userEvent.click(getByTestId('navigation-submenu-item'));
+
+		expect(emitted('itemClick')).toStrictEqual([
+			[{ active: true, index: 'bbb', indexPath: ['-1', 'aaa', 'bbb'] }],
+		]);
+		expect(emitted('select')).toStrictEqual([['bbb']]);
+	});
+});
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/index.ts b/packages/design-system/src/components/N8nNavigationDropdown/index.ts
new file mode 100644
index 0000000000..210f5d57df
--- /dev/null
+++ b/packages/design-system/src/components/N8nNavigationDropdown/index.ts
@@ -0,0 +1,3 @@
+import N8nNavigationDropdown from './NavigationDropdown.vue';
+
+export default N8nNavigationDropdown;
diff --git a/packages/design-system/src/components/N8nOption/Option.vue b/packages/design-system/src/components/N8nOption/Option.vue
index bd56fdab91..e7c44f475c 100644
--- a/packages/design-system/src/components/N8nOption/Option.vue
+++ b/packages/design-system/src/components/N8nOption/Option.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { ElOption } from 'element-plus';
 
-defineProps({
+const props = defineProps({
 	...ElOption.props,
 	value: { type: [String, Number], required: true },
 });
 </script>
 
 <template>
-	<ElOption v-bind="{ ...$props, ...$attrs }" :value="value"><slot /></ElOption>
+	<ElOption v-bind="{ ...$props, ...$attrs }" :value="props.value"><slot /></ElOption>
 </template>
diff --git a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue b/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
index ea72c506b7..5219efe2f4 100644
--- a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
+++ b/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
@@ -21,6 +21,7 @@ const emit = defineEmits<{
 	resize: [values: ResizeData];
 	resizestart: [];
 	resizeend: [];
+	'markdown-click': [link: HTMLAnchorElement, e: MouseEvent];
 }>();
 
 const attrs = useAttrs();
@@ -42,6 +43,10 @@ const onResizeEnd = () => {
 	isResizing.value = false;
 	emit('resizeend');
 };
+
+const onMarkdownClick = (link: HTMLAnchorElement, event: MouseEvent) => {
+	emit('markdown-click', link, event);
+};
 </script>
 
 <template>
@@ -57,6 +62,6 @@ const onResizeEnd = () => {
 		@resize="onResize"
 		@resizestart="onResizeStart"
 	>
-		<N8nSticky v-bind="stickyBindings" />
+		<N8nSticky v-bind="stickyBindings" @markdown-click="onMarkdownClick" />
 	</N8nResizeWrapper>
 </template>
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 1e2870c5d1..7cb4fafcc9 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -120,9 +120,9 @@ defineExpose({
 		<ElSelect
 			v-bind="{ ...$props, ...listeners }"
 			ref="innerSelect"
-			:model-value="modelValue ?? undefined"
+			:model-value="props.modelValue ?? undefined"
 			:size="computedSize"
-			:popper-class="popperClass"
+			:popper-class="props.popperClass"
 			:class="$style[classes]"
 		>
 			<template v-if="$slots.prefix" #prefix>
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/design-system/src/components/N8nSticky/Sticky.vue
index 73aa4933a3..569cd15974 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.vue
+++ b/packages/design-system/src/components/N8nSticky/Sticky.vue
@@ -13,7 +13,7 @@ const props = withDefaults(defineProps<StickyProps>(), defaultStickyProps);
 const emit = defineEmits<{
 	edit: [editing: boolean];
 	'update:modelValue': [value: string];
-	'markdown-click': [link: string, e: Event];
+	'markdown-click': [link: HTMLAnchorElement, e: MouseEvent];
 }>();
 
 const { t } = useI18n();
@@ -63,7 +63,7 @@ const onUpdateModelValue = (value: string) => {
 	emit('update:modelValue', value);
 };
 
-const onMarkdownClick = (link: string, event: Event) => {
+const onMarkdownClick = (link: HTMLAnchorElement, event: MouseEvent) => {
 	emit('markdown-click', link, event);
 };
 
diff --git a/packages/design-system/src/components/index.ts b/packages/design-system/src/components/index.ts
index d4f44016f7..2d06e5b8c6 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -28,6 +28,7 @@ export { default as N8nLoading } from './N8nLoading';
 export { default as N8nMarkdown } from './N8nMarkdown';
 export { default as N8nMenu } from './N8nMenu';
 export { default as N8nMenuItem } from './N8nMenuItem';
+export { default as N8nNavigationDropdown } from './N8nNavigationDropdown';
 export { default as N8nNodeCreatorNode } from './N8nNodeCreatorNode';
 export { default as N8nNodeIcon } from './N8nNodeIcon';
 export { default as N8nNotice } from './N8nNotice';
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index 8377f524c6..72963efcf5 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -212,6 +212,7 @@
 	--execution-selector-background: var(--prim-gray-740);
 	--execution-selector-text: var(--color-text-base);
 	--execution-select-all-text: var(--color-text-base);
+	--execution-card-text-waiting: var(--prim-color-secondary-tint-100);
 
 	// NDV
 	--color-run-data-background: var(--prim-gray-800);
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index 1690926232..56d5142c87 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -273,6 +273,7 @@
 	--execution-card-border-running: var(--prim-color-alt-b-tint-250);
 	--execution-card-border-unknown: var(--prim-gray-120);
 	--execution-card-background-hover: var(--color-foreground-light);
+	--execution-card-text-waiting: var(--color-secondary);
 	--execution-selector-background: var(--color-background-dark);
 	--execution-selector-text: var(--color-text-xlight);
 	--execution-select-all-text: var(--color-danger);
diff --git a/packages/design-system/src/directives/n8n-truncate.test.ts b/packages/design-system/src/directives/n8n-truncate.test.ts
index 89cd771283..309cab4563 100644
--- a/packages/design-system/src/directives/n8n-truncate.test.ts
+++ b/packages/design-system/src/directives/n8n-truncate.test.ts
@@ -24,7 +24,7 @@ describe('Directive n8n-truncate', () => {
 				},
 			},
 		);
-		expect(html()).toBe('<div>This is a very long text that...</div>');
+		expect(html()).toBe('<div>This is a very long text that ...</div>');
 	});
 
 	it('should truncate text to 30 chars in case of wrong argument', async () => {
@@ -48,7 +48,7 @@ describe('Directive n8n-truncate', () => {
 				},
 			},
 		);
-		expect(html()).toBe('<div>This is a very long text that...</div>');
+		expect(html()).toBe('<div>This is a very long text that ...</div>');
 	});
 
 	it('should truncate text to given length', async () => {
@@ -72,6 +72,6 @@ describe('Directive n8n-truncate', () => {
 				},
 			},
 		);
-		expect(html()).toBe('<div>This is a very long text...</div>');
+		expect(html()).toBe('<div>This is a very long text ...</div>');
 	});
 });
diff --git a/packages/design-system/src/types/form.ts b/packages/design-system/src/types/form.ts
index 45a054a012..bffaf67c81 100644
--- a/packages/design-system/src/types/form.ts
+++ b/packages/design-system/src/types/form.ts
@@ -56,6 +56,7 @@ export type IFormInput = {
 		focusInitially?: boolean;
 		disabled?: boolean;
 		labelSize?: 'small' | 'medium' | 'large';
+		tagSize?: 'small' | 'medium' | 'large';
 		labelAlignment?: 'left' | 'right' | 'center';
 		tooltipText?: string;
 	};
diff --git a/packages/design-system/src/utils/index.ts b/packages/design-system/src/utils/index.ts
index be6ddc6375..d029baaa26 100644
--- a/packages/design-system/src/utils/index.ts
+++ b/packages/design-system/src/utils/index.ts
@@ -5,3 +5,4 @@ export * from './typeguards';
 export * from './uid';
 export * from './valueByPath';
 export * from './testUtils';
+export * from './string';
diff --git a/packages/design-system/src/utils/labelUtil.spec.ts b/packages/design-system/src/utils/labelUtil.spec.ts
index 51289d1736..99f961d485 100644
--- a/packages/design-system/src/utils/labelUtil.spec.ts
+++ b/packages/design-system/src/utils/labelUtil.spec.ts
@@ -1,3 +1,5 @@
+import type { MockInstance } from 'vitest';
+
 import { getInitials } from './labelUtil';
 
 describe('labelUtil.getInitials', () => {
@@ -26,4 +28,29 @@ describe('labelUtil.getInitials', () => {
 	])('turns "%s" into "%s"', (input, output) => {
 		expect(getInitials(input)).toBe(output);
 	});
+
+	describe('when Intl.Segmenter is not supported', () => {
+		let intlSpy: MockInstance;
+
+		beforeEach(() => {
+			// No Intl.Segmenter support
+			intlSpy = vi.spyOn(globalThis, 'Intl', 'get');
+			intlSpy.mockImplementation(() => ({}));
+		});
+
+		it.each([
+			['', ''],
+
+			// simple words
+			['Hello', 'He'],
+			['Hello World', 'HW'],
+			['H', 'H'],
+
+			// multiple spaces
+			['Double  Space', 'DS'],
+			['        ', ''],
+		])('turns "%s" into "%s"', (input, output) => {
+			expect(getInitials(input)).toBe(output);
+		});
+	});
 });
diff --git a/packages/design-system/src/utils/labelUtil.ts b/packages/design-system/src/utils/labelUtil.ts
index ee6f8903f6..073b06179c 100644
--- a/packages/design-system/src/utils/labelUtil.ts
+++ b/packages/design-system/src/utils/labelUtil.ts
@@ -1,25 +1,19 @@
 export const getInitials = (label: string): string => {
-	const words = label
-		.split(' ')
-		.filter((word) => word !== '')
-		.map((word) => [...new Intl.Segmenter().segment(word)]);
+	const isSegmenterSupported = typeof Intl !== 'undefined' && 'Segmenter' in Intl;
 
-	if (words.length === 0) {
-		return '';
-	} else if (words.length === 1) {
-		// first two segments of the first word
-		return (
-			words
-				.at(0)
-				?.slice(0, 2)
-				.map((grapheme) => grapheme.segment)
-				.join('') ?? ''
-		);
-	} else {
-		// first segment ok the first two words
-		return words
-			.slice(0, 2)
-			.map((word) => word.at(0)?.segment ?? '')
-			.join('');
-	}
+	const segmentWord = (word: string): string[] => {
+		if (isSegmenterSupported) {
+			return [...new Intl.Segmenter().segment(word)].map((s) => s.segment);
+		}
+		return word.split('');
+	};
+
+	const getFirstSegment = (word: string[]): string => word[0] || '';
+	const getFirstTwoSegments = (word: string[]): string => word.slice(0, 2).join('');
+
+	const words = label.split(' ').filter(Boolean).map(segmentWord);
+
+	if (words.length === 0) return '';
+	if (words.length === 1) return getFirstTwoSegments(words[0]);
+	return words.slice(0, 2).map(getFirstSegment).join('');
 };
diff --git a/packages/design-system/src/utils/string.test.ts b/packages/design-system/src/utils/string.test.ts
index 6f65775f9a..0517d260d4 100644
--- a/packages/design-system/src/utils/string.test.ts
+++ b/packages/design-system/src/utils/string.test.ts
@@ -4,13 +4,13 @@ describe('Utils string', () => {
 	describe('truncate', () => {
 		it('should truncate text to 30 chars by default', () => {
 			expect(truncate('This is a very long text that should be truncated')).toBe(
-				'This is a very long text that...',
+				'This is a very long text that ...',
 			);
 		});
 
 		it('should truncate text to given length', () => {
 			expect(truncate('This is a very long text that should be truncated', 25)).toBe(
-				'This is a very long text...',
+				'This is a very long text ...',
 			);
 		});
 	});
diff --git a/packages/design-system/src/utils/string.ts b/packages/design-system/src/utils/string.ts
index 9170b57c00..1c2b2aecfd 100644
--- a/packages/design-system/src/utils/string.ts
+++ b/packages/design-system/src/utils/string.ts
@@ -1,2 +1,2 @@
 export const truncate = (text: string, length = 30): string =>
-	text.length > length ? text.slice(0, length).trim() + '...' : text;
+	text.length > length ? text.slice(0, length) + '...' : text;
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 2bd69ffb30..cdb9814101 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.61.0",
+  "version": "1.63.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "scripts": {
@@ -38,16 +38,17 @@
     "@n8n/codemirror-lang": "workspace:*",
     "@n8n/codemirror-lang-sql": "^1.0.2",
     "@n8n/permissions": "workspace:*",
-    "@sentry/vue": "^8.31.0",
+    "@sentry/vue": "catalog:frontend",
     "@vue-flow/background": "^1.3.0",
-    "@vue-flow/controls": "^1.1.1",
-    "@vue-flow/core": "^1.33.5",
-    "@vue-flow/minimap": "^1.4.0",
+    "@vue-flow/controls": "^1.1.2",
+    "@vue-flow/core": "^1.41.2",
+    "@vue-flow/minimap": "^1.5.0",
     "@vue-flow/node-resizer": "^1.4.0",
     "@vueuse/components": "^10.11.0",
     "@vueuse/core": "^10.11.0",
     "axios": "catalog:",
     "bowser": "2.11.0",
+    "change-case": "^5.4.4",
     "chart.js": "^4.4.0",
     "codemirror-lang-html-n8n": "^1.0.0",
     "dateformat": "^3.0.3",
@@ -63,7 +64,7 @@
     "luxon": "catalog:",
     "n8n-design-system": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "pinia": "^2.1.6",
+    "pinia": "^2.2.4",
     "prettier": "^3.3.3",
     "qrcode.vue": "^3.3.4",
     "stream-browserify": "^3.0.0",
@@ -83,8 +84,8 @@
   "devDependencies": {
     "@faker-js/faker": "^8.0.2",
     "@iconify/json": "^2.2.228",
-    "@pinia/testing": "^0.1.3",
-    "@sentry/vite-plugin": "^2.22.4",
+    "@pinia/testing": "^0.1.6",
+    "@sentry/vite-plugin": "^2.22.5",
     "@types/dateformat": "^3.0.0",
     "@types/file-saver": "^2.0.1",
     "@types/humanize-duration": "^3.27.1",
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index f6587e8e3b..97ca0cf4eb 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -116,10 +116,6 @@ declare global {
 		};
 		// eslint-disable-next-line @typescript-eslint/naming-convention
 		Cypress: unknown;
-
-		Sentry?: {
-			captureException: (error: Error, metadata?: unknown) => void;
-		};
 	}
 }
 
@@ -874,6 +870,7 @@ export interface RootState {
 	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
+	endpointWebhookWaiting: string;
 	pushConnectionActive: boolean;
 	timezone: string;
 	executionTimeout: number;
@@ -905,6 +902,7 @@ export interface IRootState {
 	endpointFormWaiting: string;
 	endpointWebhook: string;
 	endpointWebhookTest: string;
+	endpointWebhookWaiting: string;
 	executionId: string | null;
 	executingNode: string[];
 	executionWaitingForWebhook: boolean;
@@ -1643,3 +1641,11 @@ export type EnterpriseEditionFeatureValue = keyof Omit<FrontendSettings['enterpr
 export interface IN8nPromptResponse {
 	updated: boolean;
 }
+
+export type ApiKey = {
+	id: string;
+	label: string;
+	apiKey: string;
+	createdAt: string;
+	updatedAt: string;
+};
diff --git a/packages/editor-ui/src/__tests__/data/canvas.ts b/packages/editor-ui/src/__tests__/data/canvas.ts
index e0e748b89c..10f36dc9ba 100644
--- a/packages/editor-ui/src/__tests__/data/canvas.ts
+++ b/packages/editor-ui/src/__tests__/data/canvas.ts
@@ -1,11 +1,13 @@
-import { CanvasNodeHandleKey, CanvasNodeKey } from '@/constants';
-import { ref } from 'vue';
+import { CanvasKey, CanvasNodeHandleKey, CanvasNodeKey } from '@/constants';
+import { computed, ref } from 'vue';
 import type {
+	CanvasInjectionData,
 	CanvasNode,
 	CanvasNodeData,
 	CanvasNodeEventBusEvents,
 	CanvasNodeHandleInjectionData,
 	CanvasNodeInjectionData,
+	ConnectStartEvent,
 	ExecutionOutputMapData,
 } from '@/types';
 import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
@@ -88,6 +90,21 @@ export function createCanvasNodeProps({
 	};
 }
 
+export function createCanvasProvide({
+	isExecuting = false,
+	connectingHandle = undefined,
+}: {
+	isExecuting?: boolean;
+	connectingHandle?: ConnectStartEvent;
+} = {}) {
+	return {
+		[String(CanvasKey)]: {
+			isExecuting: ref(isExecuting),
+			connectingHandle: ref(connectingHandle),
+		} satisfies CanvasInjectionData,
+	};
+}
+
 export function createCanvasNodeProvide({
 	id = 'node',
 	label = 'Test Node',
@@ -125,6 +142,7 @@ export function createCanvasHandleProvide({
 	isConnected = false,
 	isConnecting = false,
 	isReadOnly = false,
+	isRequired = false,
 }: {
 	label?: string;
 	mode?: CanvasConnectionMode;
@@ -134,6 +152,7 @@ export function createCanvasHandleProvide({
 	isConnected?: boolean;
 	isConnecting?: boolean;
 	isReadOnly?: boolean;
+	isRequired?: boolean;
 } = {}) {
 	return {
 		[String(CanvasNodeHandleKey)]: {
@@ -141,10 +160,11 @@ export function createCanvasHandleProvide({
 			mode: ref(mode),
 			type: ref(type),
 			index: ref(index),
-			isConnected: ref(isConnected),
+			isConnected: computed(() => isConnected),
 			isConnecting: ref(isConnecting),
-			runData: ref(runData),
 			isReadOnly: ref(isReadOnly),
+			isRequired: ref(isRequired),
+			runData: ref(runData),
 		} satisfies CanvasNodeHandleInjectionData,
 	};
 }
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
index a8f6f6ca05..dd4fbed9d5 100644
--- a/packages/editor-ui/src/__tests__/defaults.ts
+++ b/packages/editor-ui/src/__tests__/defaults.ts
@@ -16,6 +16,7 @@ export const defaultSettings: FrontendSettings = {
 	endpointFormWaiting: '',
 	endpointWebhook: '',
 	endpointWebhookTest: '',
+	endpointWebhookWaiting: '',
 	enterprise: {
 		sharing: false,
 		ldap: false,
@@ -110,7 +111,7 @@ export const defaultSettings: FrontendSettings = {
 	mfa: {
 		enabled: false,
 	},
-	ai: {
+	askAi: {
 		enabled: false,
 	},
 	workflowHistory: {
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index b7182b6e9b..378a58b4b1 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -1,30 +1,44 @@
-import type { IRestApiContext, Schema } from '@/Interface';
-import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { IRestApiContext } from '@/Interface';
+import type { AskAiRequest, ChatRequest, ReplaceCodeRequest } from '@/types/assistant.types';
+import { makeRestApiRequest, streamRequest } from '@/utils/apiUtils';
 import type { IDataObject } from 'n8n-workflow';
 
+export function chatWithAssistant(
+	ctx: IRestApiContext,
+	payload: ChatRequest.RequestPayload,
+	onMessageUpdated: (data: ChatRequest.ResponsePayload) => void,
+	onDone: () => void,
+	onError: (e: Error) => void,
+): void {
+	void streamRequest<ChatRequest.ResponsePayload>(
+		ctx,
+		'/ai/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/chat/apply-suggestion',
+		data,
+	);
+}
+
 export async function generateCodeForPrompt(
 	ctx: IRestApiContext,
-	{
-		question,
-		context,
-		model,
-		n8nVersion,
-	}: {
-		question: string;
-		context: {
-			schema: Array<{ nodeName: string; schema: Schema }>;
-			inputSchema: { nodeName: string; schema: Schema };
-			pushRef: string;
-			ndvPushRef: string;
-		};
-		model: string;
-		n8nVersion: string;
-	},
+	{ question, context, forNode }: AskAiRequest.RequestPayload,
 ): Promise<{ code: string }> {
-	return await makeRestApiRequest(ctx, 'POST', '/ask-ai', {
+	return await makeRestApiRequest(ctx, 'POST', '/ai/ask-ai', {
 		question,
 		context,
-		model,
-		n8nVersion,
+		forNode,
 	} as IDataObject);
 }
diff --git a/packages/editor-ui/src/api/api-keys.ts b/packages/editor-ui/src/api/api-keys.ts
index b7d2206c43..b4b44c8e13 100644
--- a/packages/editor-ui/src/api/api-keys.ts
+++ b/packages/editor-ui/src/api/api-keys.ts
@@ -1,14 +1,17 @@
-import type { IRestApiContext } from '@/Interface';
+import type { ApiKey, IRestApiContext } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
 
-export async function getApiKey(context: IRestApiContext): Promise<{ apiKey: string | null }> {
-	return await makeRestApiRequest(context, 'GET', '/me/api-key');
+export async function getApiKeys(context: IRestApiContext): Promise<ApiKey[]> {
+	return await makeRestApiRequest(context, 'GET', '/api-keys');
 }
 
-export async function createApiKey(context: IRestApiContext): Promise<{ apiKey: string | null }> {
-	return await makeRestApiRequest(context, 'POST', '/me/api-key');
+export async function createApiKey(context: IRestApiContext): Promise<ApiKey> {
+	return await makeRestApiRequest(context, 'POST', '/api-keys');
 }
 
-export async function deleteApiKey(context: IRestApiContext): Promise<{ success: boolean }> {
-	return await makeRestApiRequest(context, 'DELETE', '/me/api-key');
+export async function deleteApiKey(
+	context: IRestApiContext,
+	id: string,
+): Promise<{ success: boolean }> {
+	return await makeRestApiRequest(context, 'DELETE', `/api-keys/${id}`);
 }
diff --git a/packages/editor-ui/src/api/assistant.ts b/packages/editor-ui/src/api/assistant.ts
deleted file mode 100644
index 4b1d127ef1..0000000000
--- a/packages/editor-ui/src/api/assistant.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-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<ChatRequest.ResponsePayload>(
-		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/api/usage.ts b/packages/editor-ui/src/api/usage.ts
index 321d05131a..274175b99e 100644
--- a/packages/editor-ui/src/api/usage.ts
+++ b/packages/editor-ui/src/api/usage.ts
@@ -1,3 +1,4 @@
+import type { CommunityRegisteredRequestDto } from '@n8n/api-types';
 import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { IRestApiContext, UsageState } from '@/Interface';
 
@@ -21,3 +22,15 @@ export const requestLicenseTrial = async (
 ): Promise<UsageState['data']> => {
 	return await makeRestApiRequest(context, 'POST', '/license/enterprise/request_trial');
 };
+
+export const registerCommunityEdition = async (
+	context: IRestApiContext,
+	params: CommunityRegisteredRequestDto,
+): Promise<{ title: string; text: string }> => {
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		'/license/enterprise/community-registered',
+		params,
+	);
+};
diff --git a/packages/editor-ui/src/components/AnnotationTagsContainer.vue b/packages/editor-ui/src/components/AnnotationTagsContainer.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/AnnotationTagsContainer.vue
rename to packages/editor-ui/src/components/AnnotationTagsContainer.ee.vue
diff --git a/packages/editor-ui/src/components/AnnotationTagsDropdown.vue b/packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/AnnotationTagsDropdown.vue
rename to packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
index 39f77f0fcf..47c86755b7 100644
--- a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
@@ -7,8 +7,6 @@ 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 { useTelemetry } from '@/composables/useTelemetry';
 import { generateCodeForPrompt } from '@/api/ai';
@@ -16,6 +14,8 @@ import { generateCodeForPrompt } from '@/api/ai';
 import { format } from 'prettier';
 import jsParser from 'prettier/plugins/babel';
 import * as estree from 'prettier/plugins/estree';
+import { useSettingsStore } from '@/stores/settings.store';
+import type { AskAiRequest } from '@/types/assistant.types';
 
 const emit = defineEmits<{
 	valueChanged: [value: IUpdateInformation];
@@ -27,8 +27,8 @@ const props = defineProps<{
 	path: string;
 }>();
 
-const posthog = usePostHog();
 const rootStore = useRootStore();
+const settingsStore = useSettingsStore();
 
 const i18n = useI18n();
 
@@ -94,13 +94,8 @@ async function onSubmit() {
 
 	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 = {
+		const payload: AskAiRequest.RequestPayload = {
 			question: prompt.value,
 			context: {
 				schema: schemas.parentNodesSchemas,
@@ -108,13 +103,12 @@ async function onSubmit() {
 				ndvPushRef: useNDVStore().pushRef,
 				pushRef: rootStore.pushRef,
 			},
-			model,
-			n8nVersion: version,
+			forNode: 'transform',
 		};
 		switch (type) {
 			case 'askAiCodeGeneration':
 				let value;
-				if (posthog.isAiEnabled()) {
+				if (settingsStore.isAskAiEnabled) {
 					const { restApiContext } = useRootStore();
 					const { code } = await generateCodeForPrompt(restApiContext, payload);
 					value = code;
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index 95f8bba04c..b68e613a1d 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -16,16 +16,15 @@ import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { useNDVStore } from '@/stores/ndv.store';
-import { usePostHog } from '@/stores/posthog.store';
 import { useRootStore } from '@/stores/root.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { executionDataToJson } from '@/utils/nodeTypesUtils';
 import {
-	ASK_AI_EXPERIMENT,
 	ASK_AI_MAX_PROMPT_LENGTH,
 	ASK_AI_MIN_PROMPT_LENGTH,
 	ASK_AI_LOADING_DURATION_MS,
 } from '@/constants';
+import type { AskAiRequest } from '@/types/assistant.types';
 
 const emit = defineEmits<{
 	submit: [code: string];
@@ -89,7 +88,7 @@ function getParentNodes() {
 			return name !== activeNode.name && nodes.findIndex((node) => node.name === name) === i;
 		})
 		.map((n) => getNodeByName(n.name))
-		.filter((n) => n !== null) as INodeUi[];
+		.filter((n) => n !== null);
 }
 
 function getSchemas() {
@@ -156,24 +155,19 @@ async function onSubmit() {
 
 	const rootStore = useRootStore();
 
-	try {
-		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: AskAiRequest.RequestPayload = {
+		question: prompt.value,
+		context: {
+			schema: schemas.parentNodesSchemas,
+			inputSchema: schemas.inputSchema!,
+			ndvPushRef: useNDVStore().pushRef,
+			pushRef: rootStore.pushRef,
+		},
+		forNode: 'code',
+	};
 
-		const { code } = await generateCodeForPrompt(restApiContext, {
-			question: prompt.value,
-			context: {
-				schema: schemas.parentNodesSchemas,
-				inputSchema: schemas.inputSchema!,
-				ndvPushRef: useNDVStore().pushRef,
-				pushRef: rootStore.pushRef,
-			},
-			model,
-			n8nVersion: version,
-		});
+	try {
+		const { code } = await generateCodeForPrompt(restApiContext, payload);
 
 		stopLoading();
 		emit('replaceCode', code);
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 3ef1782b05..f46e8f3290 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -15,7 +15,6 @@ import { type Ref, computed, nextTick, onBeforeUnmount, onMounted, ref, toRaw, w
 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 AskAI from './AskAI/AskAI.vue';
@@ -27,6 +26,7 @@ import { codeNodeEditorTheme } from './theme';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { dropInCodeEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
+import { useSettingsStore } from '@/stores/settings.store';
 
 type Props = {
 	mode: CodeExecutionMode;
@@ -67,9 +67,9 @@ const { autocompletionExtension } = useCompleter(() => props.mode, editor);
 const { createLinter } = useLinter(() => props.mode, editor);
 
 const rootStore = useRootStore();
-const posthog = usePostHog();
 const i18n = useI18n();
 const telemetry = useTelemetry();
+const settingsStore = useSettingsStore();
 
 onMounted(() => {
 	if (!props.isReadOnly) codeNodeEditorEventBus.on('highlightLine', highlightLine);
@@ -146,8 +146,8 @@ onBeforeUnmount(() => {
 	if (!props.isReadOnly) codeNodeEditorEventBus.off('highlightLine', highlightLine);
 });
 
-const aiEnabled = computed(() => {
-	return posthog.isAiEnabled() && props.language === 'javaScript';
+const askAiEnabled = computed(() => {
+	return settingsStore.isAskAiEnabled && props.language === 'javaScript';
 });
 
 const placeholder = computed(() => {
@@ -218,7 +218,7 @@ watch(
 	},
 );
 watch(
-	aiEnabled,
+	askAiEnabled,
 	async (isEnabled) => {
 		if (isEnabled && !props.modelValue) {
 			emit('update:modelValue', placeholder.value);
@@ -391,7 +391,7 @@ async function onDrop(value: string, event: MouseEvent) {
 		@mouseout="onMouseOut"
 	>
 		<el-tabs
-			v-if="aiEnabled"
+			v-if="askAiEnabled"
 			ref="tabs"
 			v-model="activeTab"
 			type="card"
diff --git a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.test.ts b/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.test.ts
new file mode 100644
index 0000000000..fffed9a4c1
--- /dev/null
+++ b/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.test.ts
@@ -0,0 +1,193 @@
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { mockedStore } from '@/__tests__/utils';
+import { createComponentRenderer } from '@/__tests__/render';
+import CommunityPlusEnrollmentModal from '@/components/CommunityPlusEnrollmentModal.vue';
+import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/constants';
+import { useUsageStore } from '@/stores/usage.store';
+import { useToast } from '@/composables/useToast';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useUsersStore } from '@/stores/users.store';
+
+vi.mock('@/composables/useToast', () => {
+	const showMessage = vi.fn();
+	const showError = vi.fn();
+	return {
+		useToast: () => {
+			return {
+				showMessage,
+				showError,
+			};
+		},
+	};
+});
+
+vi.mock('@/composables/useTelemetry', () => {
+	const track = vi.fn();
+	return {
+		useTelemetry: () => {
+			return {
+				track,
+			};
+		},
+	};
+});
+
+const renderComponent = createComponentRenderer(CommunityPlusEnrollmentModal, {
+	global: {
+		stubs: {
+			Modal: {
+				template:
+					'<div role="dialog"><slot name="header" /><slot name="content" /><slot name="footer" /></div>',
+			},
+		},
+	},
+});
+
+describe('CommunityPlusEnrollmentModal', () => {
+	const buttonLabel = 'Send me a free license key';
+
+	beforeEach(() => {
+		createTestingPinia();
+	});
+
+	it('should not throw error opened only with the name', () => {
+		const props = {
+			modalName: COMMUNITY_PLUS_ENROLLMENT_MODAL,
+		};
+
+		expect(() => renderComponent({ props })).not.toThrow();
+	});
+
+	it('should test enrolling', async () => {
+		const closeCallbackSpy = vi.fn();
+		const usageStore = mockedStore(useUsageStore);
+		const toast = useToast();
+
+		usageStore.registerCommunityEdition.mockResolvedValue({
+			title: 'Title',
+			text: 'Text',
+		});
+
+		const props = {
+			modalName: COMMUNITY_PLUS_ENROLLMENT_MODAL,
+			data: {
+				closeCallback: closeCallbackSpy,
+			},
+		};
+
+		const { getByRole } = renderComponent({ props });
+		const emailInput = getByRole('textbox');
+		expect(emailInput).toBeVisible();
+
+		await userEvent.type(emailInput, 'not-an-email');
+		expect(emailInput).toHaveValue('not-an-email');
+		expect(getByRole('button', { name: buttonLabel })).toBeDisabled();
+
+		await userEvent.clear(emailInput);
+		await userEvent.type(emailInput, 'test@ema.il');
+		expect(emailInput).toHaveValue('test@ema.il');
+		expect(getByRole('button', { name: buttonLabel })).toBeEnabled();
+
+		await userEvent.click(getByRole('button', { name: buttonLabel }));
+		expect(usageStore.registerCommunityEdition).toHaveBeenCalledWith('test@ema.il');
+		expect(toast.showMessage).toHaveBeenCalledWith({
+			title: 'Title',
+			message: 'Text',
+			type: 'success',
+			duration: 0,
+		});
+		expect(closeCallbackSpy).toHaveBeenCalled();
+	});
+
+	it('should test enrolling error', async () => {
+		const closeCallbackSpy = vi.fn();
+		const usageStore = mockedStore(useUsageStore);
+		const toast = useToast();
+
+		usageStore.registerCommunityEdition.mockRejectedValue(
+			new Error('Failed to register community edition'),
+		);
+
+		const props = {
+			modalName: COMMUNITY_PLUS_ENROLLMENT_MODAL,
+			data: {
+				closeCallback: closeCallbackSpy,
+			},
+		};
+
+		const { getByRole } = renderComponent({ props });
+		const emailInput = getByRole('textbox');
+		expect(emailInput).toBeVisible();
+
+		await userEvent.type(emailInput, 'test@ema.il');
+		expect(emailInput).toHaveValue('test@ema.il');
+		expect(getByRole('button', { name: buttonLabel })).toBeEnabled();
+
+		await userEvent.click(getByRole('button', { name: buttonLabel }));
+		expect(usageStore.registerCommunityEdition).toHaveBeenCalledWith('test@ema.il');
+		expect(toast.showError).toHaveBeenCalledWith(
+			new Error('Failed to register community edition'),
+			'License request failed',
+		);
+		expect(closeCallbackSpy).not.toHaveBeenCalled();
+	});
+
+	it('should track skipping', async () => {
+		const closeCallbackSpy = vi.fn();
+		const telemetry = useTelemetry();
+
+		const props = {
+			modalName: COMMUNITY_PLUS_ENROLLMENT_MODAL,
+			data: {
+				closeCallback: closeCallbackSpy,
+			},
+		};
+
+		const { getByRole } = renderComponent({ props });
+		const skipButton = getByRole('button', { name: 'Skip' });
+		expect(skipButton).toBeVisible();
+
+		await userEvent.click(skipButton);
+		expect(telemetry.track).toHaveBeenCalledWith('User skipped community plus');
+	});
+
+	it('should use user email if possible', async () => {
+		const closeCallbackSpy = vi.fn();
+		const usersStore = mockedStore(useUsersStore);
+
+		usersStore.currentUser = {
+			id: '1',
+			email: 'test@n8n.io',
+			isDefaultUser: false,
+			isPending: false,
+			mfaEnabled: false,
+			isPendingUser: false,
+		};
+
+		const props = {
+			modalName: COMMUNITY_PLUS_ENROLLMENT_MODAL,
+			data: {
+				closeCallback: closeCallbackSpy,
+			},
+		};
+
+		const { getByRole } = renderComponent({ props });
+		const emailInput = getByRole('textbox');
+		expect(emailInput).toHaveValue('test@n8n.io');
+	});
+
+	it('should not throw error if no close callback provided', async () => {
+		const consoleErrorSpy = vi.spyOn(console, 'error');
+		const props = {
+			modalName: COMMUNITY_PLUS_ENROLLMENT_MODAL,
+		};
+
+		const { getByRole } = renderComponent({ props });
+		const skipButton = getByRole('button', { name: 'Skip' });
+		expect(skipButton).toBeVisible();
+
+		await userEvent.click(skipButton);
+		expect(consoleErrorSpy).not.toHaveBeenCalled();
+	});
+});
diff --git a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue b/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
new file mode 100644
index 0000000000..420b193b30
--- /dev/null
+++ b/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
@@ -0,0 +1,186 @@
+<script lang="ts" setup="">
+import { ref } from 'vue';
+import { createEventBus } from 'n8n-design-system/utils';
+import type { Validatable, IValidator } from 'n8n-design-system';
+import { N8nFormInput } from 'n8n-design-system';
+import { VALID_EMAIL_REGEX } from '@/constants';
+import Modal from '@/components/Modal.vue';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useUsageStore } from '@/stores/usage.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useUsersStore } from '@/stores/users.store';
+
+const props = defineProps<{
+	modalName: string;
+	data?: {
+		closeCallback?: () => void;
+	};
+}>();
+
+const i18n = useI18n();
+const toast = useToast();
+const usageStore = useUsageStore();
+const telemetry = useTelemetry();
+const usersStore = useUsersStore();
+
+const valid = ref(false);
+const email = ref(usersStore.currentUser?.email ?? '');
+const validationRules = ref([{ name: 'email' }]);
+const validators = ref<{ [key: string]: IValidator }>({
+	email: {
+		validate: (value: Validatable) => {
+			if (typeof value !== 'string') {
+				return false;
+			}
+
+			if (!VALID_EMAIL_REGEX.test(value)) {
+				return {
+					messageKey: 'settings.users.invalidEmailError',
+					options: { interpolate: { email: value } },
+				};
+			}
+
+			return false;
+		},
+	},
+});
+
+const modalBus = createEventBus();
+
+const closeModal = () => {
+	telemetry.track('User skipped community plus');
+	modalBus.emit('close');
+	props.data?.closeCallback?.();
+};
+
+const confirm = async () => {
+	try {
+		const { title, text } = await usageStore.registerCommunityEdition(email.value);
+		closeModal();
+		toast.showMessage({
+			title: title ?? i18n.baseText('communityPlusModal.success.title'),
+			message:
+				text ??
+				i18n.baseText('communityPlusModal.success.message', {
+					interpolate: { email: email.value },
+				}),
+			type: 'success',
+			duration: 0,
+		});
+	} catch (error) {
+		toast.showError(error, i18n.baseText('communityPlusModal.error.title'));
+	}
+};
+</script>
+
+<template>
+	<Modal
+		width="500px"
+		:name="props.modalName"
+		:event-bus="modalBus"
+		:show-close="false"
+		:close-on-click-modal="false"
+		:close-on-press-escape="false"
+	>
+		<template #content>
+			<div>
+				<p :class="$style.top">
+					<N8nBadge>{{ i18n.baseText('communityPlusModal.badge') }}</N8nBadge>
+				</p>
+				<N8nText tag="h1" align="center" size="xlarge" class="mb-m">{{
+					i18n.baseText('communityPlusModal.title')
+				}}</N8nText>
+				<N8nText tag="p">{{ i18n.baseText('communityPlusModal.description') }}</N8nText>
+				<ul :class="$style.features">
+					<li>
+						<i>🕰️</i>
+						<N8nText>
+							<strong>{{ i18n.baseText('communityPlusModal.features.first.title') }}</strong>
+							{{ i18n.baseText('communityPlusModal.features.first.description') }}
+						</N8nText>
+					</li>
+					<li>
+						<i>🐞</i>
+						<N8nText>
+							<strong>{{ i18n.baseText('communityPlusModal.features.second.title') }}</strong>
+							{{ i18n.baseText('communityPlusModal.features.second.description') }}
+						</N8nText>
+					</li>
+					<li>
+						<i>🔎</i>
+						<N8nText>
+							<strong>{{ i18n.baseText('communityPlusModal.features.third.title') }}</strong>
+							{{ i18n.baseText('communityPlusModal.features.third.description') }}
+						</N8nText>
+					</li>
+				</ul>
+				<N8nFormInput
+					id="email"
+					v-model="email"
+					:label="i18n.baseText('communityPlusModal.input.email.label')"
+					type="email"
+					name="email"
+					label-size="small"
+					tag-size="small"
+					required
+					:show-required-asterisk="true"
+					:validate-on-blur="false"
+					:validation-rules="validationRules"
+					:validators="validators"
+					@validate="valid = $event"
+				/>
+			</div>
+		</template>
+		<template #footer>
+			<div :class="$style.buttons">
+				<N8nButton :class="$style.skip" type="secondary" text @click="closeModal">{{
+					i18n.baseText('communityPlusModal.button.skip')
+				}}</N8nButton>
+				<N8nButton :disabled="!valid" type="primary" @click="confirm">
+					{{ i18n.baseText('communityPlusModal.button.confirm') }}
+				</N8nButton>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style lang="scss" module>
+.top {
+	display: flex;
+	justify-content: center;
+	margin: 0 0 var(--spacing-s);
+}
+
+.features {
+	padding: var(--spacing-s) var(--spacing-l) 0;
+	list-style: none;
+
+	li {
+		display: flex;
+		padding: 0 var(--spacing-s) var(--spacing-m) 0;
+
+		i {
+			display: inline-block;
+			margin: var(--spacing-5xs) var(--spacing-xs) 0 0;
+			font-style: normal;
+			font-size: var(--font-size-s);
+		}
+
+		strong {
+			display: block;
+			margin-bottom: var(--spacing-4xs);
+		}
+	}
+}
+
+.buttons {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.skip {
+	padding: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index 958f236f1d..c39166f15a 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -21,6 +21,10 @@ const CREDENTIAL_LIST_ITEM_ACTIONS = {
 	MOVE: 'move',
 };
 
+const emit = defineEmits<{
+	click: [credentialId: string];
+}>();
+
 const props = withDefaults(
 	defineProps<{
 		data: ICredentialsResponse;
@@ -83,7 +87,7 @@ const formattedCreatedAtDate = computed(() => {
 });
 
 function onClick() {
-	uiStore.openExistingCredential(props.data.id);
+	emit('click', props.data.id);
 }
 
 async function onAction(action: string) {
@@ -131,7 +135,7 @@ function moveResource() {
 </script>
 
 <template>
-	<n8n-card :class="$style.cardLink" @click="onClick">
+	<n8n-card :class="$style.cardLink" @click.stop="onClick">
 		<template #prepend>
 			<CredentialIcon :credential-type-name="credentialType?.name ?? ''" />
 		</template>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index dd45647672..bac1079d75 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -83,10 +83,10 @@ const i18n = useI18n();
 const telemetry = useTelemetry();
 
 onBeforeMount(async () => {
-	if (rootStore.defaultLocale === 'en') return;
-
 	uiStore.activeCredentialType = props.credentialType.name;
 
+	if (rootStore.defaultLocale === 'en') return;
+
 	const key = `n8n-nodes-base.credentials.${props.credentialType.name}`;
 
 	if (i18n.exists(key)) return;
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index ba3eb19ff0..efbde8d1fb 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -420,6 +420,7 @@ async function beforeClose() {
 	}
 
 	if (!keepEditing) {
+		uiStore.activeCredentialType = null;
 		return true;
 	} else if (!requiredPropertiesFilled.value) {
 		showValidationWarning.value = true;
@@ -986,6 +987,7 @@ async function onAuthTypeChanged(type: string): Promise<void> {
 	const credentialsForType = getNodeCredentialForSelectedAuthType(activeNodeType.value, type);
 	if (credentialsForType) {
 		selectedCredential.value = credentialsForType.name;
+		uiStore.activeCredentialType = credentialsForType.name;
 		resetCredentialData();
 		// Update current node auth type so credentials dropdown can be displayed properly
 		updateNodeAuthType(ndvStore.activeNode, type);
diff --git a/packages/editor-ui/src/components/CredentialIcon.vue b/packages/editor-ui/src/components/CredentialIcon.vue
index 1da011d932..07ca323e17 100644
--- a/packages/editor-ui/src/components/CredentialIcon.vue
+++ b/packages/editor-ui/src/components/CredentialIcon.vue
@@ -1,50 +1,59 @@
 <script setup lang="ts">
-import { computed } from 'vue';
 import { useCredentialsStore } from '@/stores/credentials.store';
-import { useRootStore } from '@/stores/root.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import type { ICredentialType } from 'n8n-workflow';
-import NodeIcon from '@/components/NodeIcon.vue';
-import { getThemedValue } from '@/utils/nodeTypesUtils';
+import { useRootStore } from '@/stores/root.store';
 import { useUIStore } from '@/stores/ui.store';
+import { getThemedValue } from '@/utils/nodeTypesUtils';
+import { N8nNodeIcon } from 'n8n-design-system';
+import type { ICredentialType } from 'n8n-workflow';
+import { computed } from 'vue';
 
 const props = defineProps<{
 	credentialTypeName: string | null;
 }>();
 
 const credentialsStore = useCredentialsStore();
-const nodeTypesStore = useNodeTypesStore();
 const rootStore = useRootStore();
 const uiStore = useUIStore();
+const nodeTypesStore = useNodeTypesStore();
 
 const credentialWithIcon = computed(() => getCredentialWithIcon(props.credentialTypeName));
 
-const filePath = computed(() => {
-	const themeIconUrl = getThemedValue(credentialWithIcon.value?.iconUrl, uiStore.appliedTheme);
+const nodeBasedIconUrl = computed(() => {
+	const icon = getThemedValue(credentialWithIcon.value?.icon);
+	if (!icon?.startsWith('node:')) return null;
+	return nodeTypesStore.getNodeType(icon.replace('node:', ''))?.iconUrl;
+});
+
+const iconSource = computed(() => {
+	const themeIconUrl = getThemedValue(
+		nodeBasedIconUrl.value ?? credentialWithIcon.value?.iconUrl,
+		uiStore.appliedTheme,
+	);
 
 	if (!themeIconUrl) {
-		return null;
+		return undefined;
 	}
 
 	return rootStore.baseUrl + themeIconUrl;
 });
 
-const relevantNode = computed(() => {
-	const icon = credentialWithIcon.value?.icon;
-	if (typeof icon === 'string' && icon.startsWith('node:')) {
-		const nodeType = icon.replace('node:', '');
-		return nodeTypesStore.getNodeType(nodeType);
-	}
-	if (!props.credentialTypeName) {
-		return null;
-	}
+const iconType = computed(() => {
+	if (iconSource.value) return 'file';
+	else if (iconName.value) return 'icon';
+	return 'unknown';
+});
 
-	const nodesWithAccess = credentialsStore.getNodesWithAccess(props.credentialTypeName);
-	if (nodesWithAccess.length) {
-		return nodesWithAccess[0];
-	}
+const iconName = computed(() => {
+	const icon = getThemedValue(credentialWithIcon.value?.icon, uiStore.appliedTheme);
+	if (!icon || !icon?.startsWith('fa:')) return undefined;
+	return icon.replace('fa:', '');
+});
 
-	return null;
+const iconColor = computed(() => {
+	const { iconColor: color } = credentialWithIcon.value ?? {};
+	if (!color) return undefined;
+	return `var(--color-node-icon-${color})`;
 });
 
 function getCredentialWithIcon(name: string | null): ICredentialType | null {
@@ -64,8 +73,8 @@ function getCredentialWithIcon(name: string | null): ICredentialType | null {
 
 	if (type.extends) {
 		let parentCred = null;
-		type.extends.forEach((iconName) => {
-			parentCred = getCredentialWithIcon(iconName);
+		type.extends.forEach((credType) => {
+			parentCred = getCredentialWithIcon(credType);
 			if (parentCred !== null) return;
 		});
 		return parentCred;
@@ -76,23 +85,18 @@ function getCredentialWithIcon(name: string | null): ICredentialType | null {
 </script>
 
 <template>
-	<div>
-		<img v-if="filePath" :class="$style.credIcon" :src="filePath" />
-		<NodeIcon v-else-if="relevantNode" :node-type="relevantNode" :size="28" />
-		<span v-else :class="$style.fallback"></span>
-	</div>
+	<N8nNodeIcon
+		:class="$style.icon"
+		:type="iconType"
+		:size="26"
+		:src="iconSource"
+		:name="iconName"
+		:color="iconColor"
+	/>
 </template>
 
 <style lang="scss" module>
-.credIcon {
-	height: 26px;
-}
-
-.fallback {
-	height: 28px;
-	width: 28px;
-	display: flex;
-	border-radius: 50%;
-	background-color: var(--color-foreground-base);
+.icon {
+	--node-icon-color: var(--color-foreground-dark);
 }
 </style>
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index aa0eac4c69..749cc203e4 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -23,6 +23,7 @@ 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 { useAIAssistantHelpers } from '@/composables/useAIAssistantHelpers';
 
 type Props = {
 	// TODO: .node can be undefined
@@ -34,6 +35,7 @@ const props = defineProps<Props>();
 const clipboard = useClipboard();
 const toast = useToast();
 const i18n = useI18n();
+const assistantHelpers = useAIAssistantHelpers();
 
 const nodeTypesStore = useNodeTypesStore();
 const ndvStore = useNDVStore();
@@ -124,33 +126,11 @@ const isAskAssistantAvailable = computed(() => {
 
 const assistantAlreadyAsked = computed(() => {
 	return assistantStore.isNodeErrorActive({
-		error: simplifyErrorForAssistant(props.error),
+		error: assistantHelpers.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');
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
index 1ff90df190..897d8304b6 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
@@ -145,6 +145,13 @@ watchDebounced(
 	color: var(--color-text-base);
 	font-size: var(--font-size-2xs);
 	padding: var(--spacing-2xs);
+
+	code {
+		font-size: var(--font-size-3xs);
+		background: var(--color-background-base);
+		padding: var(--spacing-5xs);
+		border-radius: var(--border-radius-base);
+	}
 }
 
 .content {
@@ -165,13 +172,6 @@ watchDebounced(
 	display: inline;
 }
 
-code {
-	font-size: var(--font-size-3xs);
-	background: var(--color-background-base);
-	padding: var(--spacing-5xs);
-	border-radius: var(--border-radius-base);
-}
-
 .pill {
 	display: inline-flex;
 	align-items: center;
diff --git a/packages/editor-ui/src/components/InputNodeSelect.vue b/packages/editor-ui/src/components/InputNodeSelect.vue
index c7550a76c6..d0ec011e07 100644
--- a/packages/editor-ui/src/components/InputNodeSelect.vue
+++ b/packages/editor-ui/src/components/InputNodeSelect.vue
@@ -7,6 +7,7 @@ import { isPresent } from '@/utils/typesUtils';
 import type { IConnectedNode, Workflow } from 'n8n-workflow';
 import { computed } from 'vue';
 import NodeIcon from './NodeIcon.vue';
+import { truncate } from 'n8n-design-system';
 
 type Props = {
 	nodes: IConnectedNode[];
@@ -100,11 +101,7 @@ function getMultipleNodesText(nodeName: string): string {
 }
 
 function title(nodeName: string, length = 30) {
-	const truncated = nodeName.substring(0, length);
-	if (truncated.length < nodeName.length) {
-		return `${truncated}...`;
-	}
-	return truncated;
+	return truncate(nodeName, length);
 }
 
 function subtitle(nodeName: string, depth: number) {
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 24b7e7f6b2..1cc4da099d 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -24,6 +24,7 @@ import InputNodeSelect from './InputNodeSelect.vue';
 import NodeExecuteButton from './NodeExecuteButton.vue';
 import RunData from './RunData.vue';
 import WireMeUp from './WireMeUp.vue';
+import { waitingNodeTooltip } from '@/utils/executionUtils';
 
 type MappingMode = 'debugging' | 'mapping';
 
@@ -237,6 +238,9 @@ export default defineComponent({
 		isMultiInputNode(): boolean {
 			return this.activeNodeType !== null && this.activeNodeType.inputs.length > 1;
 		},
+		waitingMessage(): string {
+			return waitingNodeTooltip();
+		},
 	},
 	watch: {
 		inputMode: {
@@ -448,6 +452,11 @@ export default defineComponent({
 			</div>
 		</template>
 
+		<template #node-waiting>
+			<n8n-text :bold="true" color="text-dark" size="large">Waiting for input</n8n-text>
+			<n8n-text v-n8n-html="waitingMessage"></n8n-text>
+		</template>
+
 		<template #no-output-data>
 			<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
 				$locale.baseText('ndv.input.noOutputData')
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 0cc6dfe58e..88e51ef254 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -34,7 +34,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useProjectsStore } from '@/stores/projects.store';
 
 import { saveAs } from 'file-saver';
-import { useTitleChange } from '@/composables/useTitleChange';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { getResourcePermissions } from '@/permissions';
@@ -87,7 +87,7 @@ const locale = useI18n();
 const telemetry = useTelemetry();
 const message = useMessage();
 const toast = useToast();
-const titleChange = useTitleChange();
+const documentTitle = useDocumentTitle();
 const workflowHelpers = useWorkflowHelpers({ router });
 
 const isTagsEditEnabled = ref(false);
@@ -367,6 +367,7 @@ async function onNameSubmit({
 	if (saved) {
 		isNameEditEnabled.value = false;
 		showCreateWorkflowSuccessToast(id);
+		workflowHelpers.setDocumentTitle(newName, 'IDLE');
 	}
 	uiStore.removeActiveAction('workflowSaving');
 	onSubmit(saved);
@@ -558,7 +559,7 @@ async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise<void
 			}
 			uiStore.stateIsDirty = false;
 			// Reset tab title since workflow is deleted.
-			titleChange.titleReset();
+			documentTitle.reset();
 			toast.showMessage({
 				title: locale.baseText('mainSidebar.showMessage.handleSelect1.title'),
 				type: 'success',
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index a29e6c0779..4f431fee84 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -31,8 +31,8 @@ import {
 	WORKFLOW_HISTORY_VERSION_RESTORE,
 	SETUP_CREDENTIALS_MODAL_KEY,
 	PROJECT_MOVE_RESOURCE_MODAL,
-	PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
 	PROMPT_MFA_CODE_MODAL_KEY,
+	COMMUNITY_PLUS_ENROLLMENT_MODAL,
 } from '@/constants';
 
 import AboutModal from '@/components/AboutModal.vue';
@@ -48,7 +48,7 @@ import DuplicateWorkflowDialog from '@/components/DuplicateWorkflowDialog.vue';
 import ModalRoot from '@/components/ModalRoot.vue';
 import PersonalizationModal from '@/components/PersonalizationModal.vue';
 import WorkflowTagsManager from '@/components/TagsManager/WorkflowTagsManager.vue';
-import AnnotationTagsManager from '@/components/TagsManager/AnnotationTagsManager.vue';
+import AnnotationTagsManager from '@/components/TagsManager/AnnotationTagsManager.ee.vue';
 import UpdatesPanel from '@/components/UpdatesPanel.vue';
 import NpsSurvey from '@/components/NpsSurvey.vue';
 import WorkflowLMChat from '@/components/WorkflowLMChat/WorkflowLMChat.vue';
@@ -66,9 +66,9 @@ import DebugPaywallModal from '@/components/DebugPaywallModal.vue';
 import WorkflowHistoryVersionRestoreModal from '@/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue';
 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';
+import CommunityPlusEnrollmentModal from '@/components/CommunityPlusEnrollmentModal.vue';
 </script>
 
 <template>
@@ -249,19 +249,16 @@ import PromptMfaCodeModal from './PromptMfaCodeModal/PromptMfaCodeModal.vue';
 				/>
 			</template>
 		</ModalRoot>
-		<ModalRoot :name="PROJECT_MOVE_RESOURCE_CONFIRM_MODAL">
-			<template #default="{ modalName, data }">
-				<ProjectMoveResourceConfirmModal
-					data-test-id="project-move-resource-confirm-modal"
-					:modal-name="modalName"
-					:data="data"
-				/>
-			</template>
-		</ModalRoot>
 		<ModalRoot :name="NEW_ASSISTANT_SESSION_MODAL">
 			<template #default="{ modalName, data }">
 				<NewAssistantSessionModal :name="modalName" :data="data" />
 			</template>
 		</ModalRoot>
+
+		<ModalRoot :name="COMMUNITY_PLUS_ENROLLMENT_MODAL">
+			<template #default="{ modalName, data }">
+				<CommunityPlusEnrollmentModal :modal-name="modalName" :data="data" />
+			</template>
+		</ModalRoot>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 56ca2cecf8..6fcc93be76 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -7,6 +7,7 @@ import {
 	NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS,
 	SIMULATE_NODE_TYPE,
 	SIMULATE_TRIGGER_NODE_TYPE,
+	WAIT_NODE_TYPE,
 	WAIT_TIME_UNLIMITED,
 } from '@/constants';
 import type {
@@ -16,7 +17,7 @@ import type {
 	NodeOperationError,
 	Workflow,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+import { NodeConnectionType, NodeHelpers, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 import type { StyleValue } from 'vue';
 import { computed, onMounted, ref, watch } from 'vue';
 import xss from 'xss';
@@ -268,7 +269,7 @@ const nodeClass = computed(() => {
 const nodeExecutionStatus = computed(() => {
 	const nodeExecutionRunData = workflowsStore.getWorkflowRunData?.[props.name];
 	if (nodeExecutionRunData) {
-		return nodeExecutionRunData.filter(Boolean)[0].executionStatus ?? '';
+		return nodeExecutionRunData.filter(Boolean)[0]?.executionStatus ?? '';
 	}
 	return '';
 });
@@ -320,9 +321,24 @@ const nodeTitle = computed(() => {
 const waiting = computed(() => {
 	const workflowExecution = workflowsStore.getWorkflowExecution as ExecutionSummary;
 
-	if (workflowExecution?.waitTill) {
+	if (workflowExecution?.waitTill && !workflowExecution?.finished) {
 		const lastNodeExecuted = get(workflowExecution, 'data.resultData.lastNodeExecuted');
 		if (props.name === lastNodeExecuted) {
+			const node = props.workflow.getNode(lastNodeExecuted);
+			if (
+				node &&
+				node.type === WAIT_NODE_TYPE &&
+				['webhook', 'form'].includes(node.parameters.resume as string)
+			) {
+				const event =
+					node.parameters.resume === 'webhook'
+						? i18n.baseText('node.theNodeIsWaitingWebhookCall')
+						: i18n.baseText('node.theNodeIsWaitingFormCall');
+				return event;
+			}
+			if (node?.parameters.operation === SEND_AND_WAIT_OPERATION) {
+				return i18n.baseText('node.theNodeIsWaitingUserInput');
+			}
 			const waitDate = new Date(workflowExecution.waitTill);
 			if (waitDate.toISOString() === WAIT_TIME_UNLIMITED) {
 				return i18n.baseText('node.theNodeIsWaitingIndefinitelyForAnIncomingWebhookCall');
@@ -675,6 +691,10 @@ function openContextMenu(event: MouseEvent, source: 'node-button' | 'node-right-
 					<FontAwesomeIcon icon="sync-alt" spin />
 				</div>
 
+				<div v-if="waiting" class="node-waiting-spinner" :title="waiting">
+					<FontAwesomeIcon icon="sync-alt" spin />
+				</div>
+
 				<div class="node-trigger-tooltip__wrapper">
 					<n8n-tooltip
 						placement="top"
@@ -913,6 +933,20 @@ function openContextMenu(event: MouseEvent, source: 'node-button' | 'node-right-
 			color: hsla(var(--color-primary-h), var(--color-primary-s), var(--color-primary-l), 0.7);
 		}
 
+		.node-waiting-spinner {
+			display: inline-block;
+			position: absolute;
+			left: 0px;
+			top: 0px;
+			z-index: 12;
+			width: 100%;
+			height: 100%;
+			font-size: 3.75em;
+			line-height: 1.65em;
+			text-align: center;
+			color: hsla(var(--color-primary-h), var(--color-primary-s), var(--color-primary-l), 0.7);
+		}
+
 		.node-icon {
 			position: absolute;
 			top: calc(50% - 20px);
diff --git a/packages/editor-ui/src/components/Node/NodeCreation.vue b/packages/editor-ui/src/components/Node/NodeCreation.vue
index 38c89d135a..dd00098932 100644
--- a/packages/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreation.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { defineAsyncComponent, reactive } from 'vue';
+/* eslint-disable vue/no-multiple-template-root */
+import { defineAsyncComponent, onBeforeUnmount, onMounted, ref } from 'vue';
 import { getMidCanvasPosition } from '@/utils/nodeViewUtils';
 import {
 	DEFAULT_STICKY_HEIGHT,
@@ -10,6 +11,7 @@ import {
 import { useUIStore } from '@/stores/ui.store';
 import type { AddedNodesAndConnections, ToggleNodeCreatorOptions } from '@/Interface';
 import { useActions } from './NodeCreator/composables/useActions';
+import { useThrottleFn } from '@vueuse/core';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
 
 type Props = {
@@ -31,41 +33,26 @@ const emit = defineEmits<{
 	toggleNodeCreator: [value: ToggleNodeCreatorOptions];
 }>();
 
-const state = reactive({
-	showStickyButton: false,
-});
-
 const uiStore = useUIStore();
 
 const { getAddedNodesAndConnections } = useActions();
 
-function onCreateMenuHoverIn(mouseinEvent: MouseEvent) {
-	const buttonsWrapper = mouseinEvent.target as Element;
+const wrapperRef = ref<HTMLElement | undefined>();
+const wrapperBoundingRect = ref<DOMRect | undefined>();
+const isStickyNotesButtonVisible = ref(true);
 
-	// Once the popup menu is hovered, it's pointer events are disabled so it's not interfering with element underneath it.
-	state.showStickyButton = true;
-	const moveCallback = (mousemoveEvent: MouseEvent) => {
-		if (buttonsWrapper) {
-			const wrapperBounds = buttonsWrapper.getBoundingClientRect();
-			const wrapperH = wrapperBounds.height;
-			const wrapperW = wrapperBounds.width;
-			const wrapperLeftNear = wrapperBounds.left;
-			const wrapperLeftFar = wrapperLeftNear + wrapperW;
-			const wrapperTopNear = wrapperBounds.top;
-			const wrapperTopFar = wrapperTopNear + wrapperH;
-			const inside =
-				mousemoveEvent.pageX > wrapperLeftNear &&
-				mousemoveEvent.pageX < wrapperLeftFar &&
-				mousemoveEvent.pageY > wrapperTopNear &&
-				mousemoveEvent.pageY < wrapperTopFar;
-			if (!inside) {
-				state.showStickyButton = false;
-				document.removeEventListener('mousemove', moveCallback, false);
-			}
-		}
-	};
-	document.addEventListener('mousemove', moveCallback, false);
-}
+const onMouseMove = useThrottleFn((event: MouseEvent) => {
+	if (wrapperBoundingRect.value) {
+		const offset = 100;
+		isStickyNotesButtonVisible.value =
+			event.clientX >= wrapperBoundingRect.value.left - offset &&
+			event.clientX <= wrapperBoundingRect.value.right + offset &&
+			event.clientY >= wrapperBoundingRect.value.top - offset &&
+			event.clientY <= wrapperBoundingRect.value.bottom + offset;
+	} else {
+		isStickyNotesButtonVisible.value = true;
+	}
+}, 250);
 
 function openNodeCreator() {
 	emit('toggleNodeCreator', {
@@ -98,59 +85,61 @@ function nodeTypeSelected(nodeTypes: string[]) {
 	emit('addNodes', getAddedNodesAndConnections(nodeTypes.map((type) => ({ type }))));
 	closeNodeCreator(true);
 }
+
+onMounted(() => {
+	wrapperBoundingRect.value = wrapperRef.value?.getBoundingClientRect();
+
+	document.addEventListener('mousemove', onMouseMove);
+});
+
+onBeforeUnmount(() => {
+	document.removeEventListener('mousemove', onMouseMove);
+});
 </script>
 
 <template>
-	<div>
-		<div
-			v-if="!createNodeActive"
-			:class="[$style.nodeButtonsWrapper, state.showStickyButton ? $style.noEvents : '']"
-			@mouseenter="onCreateMenuHoverIn"
-		>
-			<div :class="$style.nodeCreatorButton" data-test-id="node-creator-plus-button">
+	<div v-if="!createNodeActive" :class="$style.nodeButtonsWrapper">
+		<div :class="$style.nodeCreatorButton" ref="wrapperRef" data-test-id="node-creator-plus-button">
+			<KeyboardShortcutTooltip
+				:label="$locale.baseText('nodeView.openNodesPanel')"
+				:shortcut="{ keys: ['Tab'] }"
+				placement="left"
+			>
+				<n8n-icon-button
+					size="large"
+					icon="plus"
+					type="tertiary"
+					:class="$style.nodeCreatorPlus"
+					@click="openNodeCreator"
+				/>
+			</KeyboardShortcutTooltip>
+			<div
+				:class="[$style.addStickyButton, isStickyNotesButtonVisible ? $style.visibleButton : '']"
+				data-test-id="add-sticky-button"
+				@click="addStickyNote"
+			>
 				<KeyboardShortcutTooltip
-					:label="$locale.baseText('nodeView.openNodesPanel')"
-					:shortcut="{ keys: ['Tab'] }"
+					:label="$locale.baseText('nodeView.addStickyHint')"
+					:shortcut="{ keys: ['s'], shiftKey: true }"
 					placement="left"
 				>
-					<n8n-icon-button
-						size="large"
-						icon="plus"
-						type="tertiary"
-						:class="$style.nodeCreatorPlus"
-						@click="openNodeCreator"
-					/>
+					<n8n-icon-button type="tertiary" :icon="['far', 'note-sticky']" />
 				</KeyboardShortcutTooltip>
-				<div
-					:class="[$style.addStickyButton, state.showStickyButton ? $style.visibleButton : '']"
-					data-test-id="add-sticky-button"
-					@click="addStickyNote"
-				>
-					<KeyboardShortcutTooltip
-						:label="$locale.baseText('nodeView.addStickyHint')"
-						:shortcut="{ keys: ['s'], shiftKey: true }"
-						placement="left"
-					>
-						<n8n-icon-button type="tertiary" :icon="['far', 'note-sticky']" />
-					</KeyboardShortcutTooltip>
-				</div>
 			</div>
 		</div>
-		<Suspense>
-			<LazyNodeCreator
-				:active="createNodeActive"
-				@node-type-selected="nodeTypeSelected"
-				@close-node-creator="closeNodeCreator"
-			/>
-		</Suspense>
 	</div>
+	<Suspense>
+		<LazyNodeCreator
+			:active="createNodeActive"
+			@node-type-selected="nodeTypeSelected"
+			@close-node-creator="closeNodeCreator"
+		/>
+	</Suspense>
 </template>
 
 <style lang="scss" module>
 .nodeButtonsWrapper {
 	position: absolute;
-	width: 150px;
-	height: 200px;
 	top: 0;
 	right: 0;
 	display: flex;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index 4991638176..9b4a8614d2 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -14,6 +14,7 @@ import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import NodeIcon from '@/components/NodeIcon.vue';
 
 import { useActions } from '../composables/useActions';
+import { useViewStacks } from '../composables/useViewStacks';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useNodeType } from '@/composables/useNodeType';
@@ -34,6 +35,7 @@ const telemetry = useTelemetry();
 
 const { actions } = useNodeCreatorStore();
 const { getAddedNodesAndConnections } = useActions();
+const { activeViewStack } = useViewStacks();
 const { isSubNodeType } = useNodeType({
 	nodeType: props.nodeType,
 });
@@ -61,7 +63,7 @@ const dataTestId = computed(() =>
 );
 
 const hasActions = computed(() => {
-	return nodeActions.value.length > 1;
+	return nodeActions.value.length > 1 && !activeViewStack.hideActions;
 });
 
 const nodeActions = computed(() => {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
index 346d67f152..08f8d14cbb 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
@@ -90,7 +90,8 @@ function onSelected(item: INodeCreateElement) {
 
 	if (item.type === 'node') {
 		const nodeActions = actions?.[item.key] || [];
-		if (nodeActions.length <= 1) {
+		// Only show actions if there are more than one or if the view is not an AI subcategory
+		if (nodeActions.length <= 1 || activeViewStack.value.hideActions) {
 			selectNodeType([item.key]);
 			return;
 		}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts
index 6f7b45cc5c..6d8174dfaa 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts
@@ -1,5 +1,5 @@
 import type { SectionCreateElement } from '@/Interface';
-import { groupItemsInSections, sortNodeCreateElements } from '../utils';
+import { formatTriggerActionName, groupItemsInSections, sortNodeCreateElements } from '../utils';
 import { mockActionCreateElement, mockNodeCreateElement, mockSectionCreateElement } from './utils';
 
 describe('NodeCreator - utils', () => {
@@ -62,4 +62,15 @@ describe('NodeCreator - utils', () => {
 			expect(sortNodeCreateElements([node1, node2, node3])).toEqual([node1, node2, node3]);
 		});
 	});
+
+	describe('formatTriggerActionName', () => {
+		test.each([
+			['project.created', 'project created'],
+			['Project Created', 'project created'],
+			['field.value.created', 'field value created'],
+			['attendee.checked_in', 'attendee checked in'],
+		])('Action name %i should become as %i', (actionName, expected) => {
+			expect(formatTriggerActionName(actionName)).toEqual(expected);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
index 85c306cdf6..e428269dbe 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
@@ -1,5 +1,5 @@
 import type { ActionTypeDescription, ActionsRecord, SimplifiedNodeType } from '@/Interface';
-import { CUSTOM_API_CALL_KEY, HTTP_REQUEST_NODE_TYPE } from '@/constants';
+import { AI_SUBCATEGORY, CUSTOM_API_CALL_KEY, HTTP_REQUEST_NODE_TYPE } from '@/constants';
 import { memoize, startCase } from 'lodash-es';
 import type {
 	ICredentialType,
@@ -12,6 +12,7 @@ import type {
 import { i18n } from '@/plugins/i18n';
 
 import { getCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
+import { formatTriggerActionName } from '../utils';
 
 const PLACEHOLDER_RECOMMENDED_ACTION_KEY = 'placeholder_recommended';
 
@@ -60,6 +61,7 @@ function getNodeTypeBase(nodeTypeDescription: INodeTypeDescription, label?: stri
 			categories: [category],
 		},
 		iconUrl: nodeTypeDescription.iconUrl,
+		iconColor: nodeTypeDescription.iconColor,
 		outputs: nodeTypeDescription.outputs,
 		icon: nodeTypeDescription.icon,
 		defaults: nodeTypeDescription.defaults,
@@ -96,6 +98,36 @@ function operationsCategory(nodeTypeDescription: INodeTypeDescription): ActionTy
 	return items;
 }
 
+function modeCategory(nodeTypeDescription: INodeTypeDescription): ActionTypeDescription[] {
+	// Mode actions should only be available for AI nodes
+	const isAINode = nodeTypeDescription.codex?.categories?.includes(AI_SUBCATEGORY);
+	if (!isAINode) return [];
+
+	const matchedProperty = nodeTypeDescription.properties.find(
+		(property) => property.name?.toLowerCase() === 'mode',
+	);
+
+	if (!matchedProperty?.options) return [];
+
+	const modeOptions = matchedProperty.options as INodePropertyOptions[];
+
+	const items = modeOptions.map((item: INodePropertyOptions) => ({
+		...getNodeTypeBase(nodeTypeDescription),
+		actionKey: item.value as string,
+		displayName: item.action ?? startCase(item.name),
+		description: item.description ?? '',
+		displayOptions: matchedProperty.displayOptions,
+		values: {
+			[matchedProperty.name]: item.value,
+		},
+	}));
+
+	// Do not return empty category
+	if (items.length === 0) return [];
+
+	return items;
+}
+
 function triggersCategory(nodeTypeDescription: INodeTypeDescription): ActionTypeDescription[] {
 	const matchingKeys = ['event', 'events', 'trigger on'];
 	const isTrigger = nodeTypeDescription.displayName?.toLowerCase().includes('trigger');
@@ -137,7 +169,7 @@ function triggersCategory(nodeTypeDescription: INodeTypeDescription): ActionType
 			displayName:
 				categoryItem.action ??
 				cachedBaseText('nodeCreator.actionsCategory.onEvent', {
-					interpolate: { event: startCase(categoryItem.name) },
+					interpolate: { event: formatTriggerActionName(categoryItem.name) },
 				}),
 			description: categoryItem.description ?? '',
 			displayOptions: matchedProperty.displayOptions,
@@ -230,7 +262,12 @@ export function useActionsGenerator() {
 	function generateNodeActions(node: INodeTypeDescription | undefined) {
 		if (!node) return [];
 		if (node.codex?.subcategories?.AI?.includes('Tools')) return [];
-		return [...triggersCategory(node), ...operationsCategory(node), ...resourceCategories(node)];
+		return [
+			...triggersCategory(node),
+			...operationsCategory(node),
+			...resourceCategories(node),
+			...modeCategory(node),
+		];
 	}
 	function filterActions(actions: ActionTypeDescription[]) {
 		// Do not show single action nodes
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
index 2ce7aad64d..3584a38723 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
@@ -43,7 +43,7 @@ import {
 	type Themed,
 } from 'n8n-workflow';
 import { useCanvasStore } from '@/stores/canvas.store';
-import { usePostHog } from '../../../../stores/posthog.store';
+import { useSettingsStore } from '@/stores/settings.store';
 
 interface ViewStack {
 	uuid?: string;
@@ -68,6 +68,7 @@ interface ViewStack {
 	searchItems?: SimplifiedNodeType[];
 	forceIncludeNodes?: string[];
 	mode?: 'actions' | 'nodes';
+	hideActions?: boolean;
 	baseFilter?: (item: INodeCreateElement) => boolean;
 	itemsMapper?: (item: INodeCreateElement) => INodeCreateElement;
 	panelClass?: string;
@@ -78,6 +79,7 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 	const nodeCreatorStore = useNodeCreatorStore();
 	const { getActiveItemIndex } = useKeyboardNavigation();
 	const i18n = useI18n();
+	const settingsStore = useSettingsStore();
 
 	const viewStacks = ref<ViewStack[]>([]);
 
@@ -344,6 +346,7 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 					subcategory: connectionType,
 				};
 			},
+			hideActions: true,
 			preventBack: true,
 		});
 	}
@@ -358,8 +361,8 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 			const subcategory = stack?.subcategory ?? DEFAULT_SUBCATEGORY;
 			let itemsInSubcategory = itemsBySubcategory.value[subcategory];
 
-			const aiEnabled = usePostHog().isAiEnabled();
-			if (!aiEnabled) {
+			const isAskAiEnabled = settingsStore.isAskAiEnabled;
+			if (!isAskAiEnabled) {
 				itemsInSubcategory = itemsInSubcategory.filter(
 					(item) => item.key !== AI_TRANSFORM_NODE_TYPE,
 				);
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index f8c1d1d3d2..ac1bc950e0 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -19,8 +19,9 @@ import { sublimeSearch } from '@/utils/sortUtils';
 import type { NodeViewItemSection } from './viewsData';
 import { i18n } from '@/plugins/i18n';
 import { sortBy } from 'lodash-es';
+import * as changeCase from 'change-case';
 
-import { usePostHog } from '@/stores/posthog.store';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export function transformNodeType(
 	node: SimplifiedNodeType,
@@ -77,8 +78,8 @@ export function sortNodeCreateElements(nodes: INodeCreateElement[]) {
 }
 
 export function searchNodes(searchFilter: string, items: INodeCreateElement[]) {
-	const aiEnabled = usePostHog().isAiEnabled();
-	if (!aiEnabled) {
+	const askAiEnabled = useSettingsStore().isAskAiEnabled;
+	if (!askAiEnabled) {
 		items = items.filter((item) => item.key !== AI_TRANSFORM_NODE_TYPE);
 	}
 
@@ -177,3 +178,11 @@ export function groupItemsInSections(
 
 	return result;
 }
+
+export const formatTriggerActionName = (actionPropertyName: string) => {
+	let name = actionPropertyName;
+	if (actionPropertyName.includes('.')) {
+		name = actionPropertyName.split('.').join(' ');
+	}
+	return changeCase.noCase(name);
+};
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index 65a5eee2fe..0efaa15cd1 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -56,7 +56,7 @@ defineOptions({
 const lastPopupCountUpdate = ref(0);
 
 const router = useRouter();
-const { runWorkflow, stopCurrentExecution } = useRunWorkflow({ router });
+const { runWorkflowResolvePending, stopCurrentExecution } = useRunWorkflow({ router });
 
 const workflowsStore = useWorkflowsStore();
 const externalHooks = useExternalHooks();
@@ -264,7 +264,7 @@ async function onClick() {
 			telemetry.track('User clicked execute node button', telemetryPayload);
 			await externalHooks.run('nodeExecuteButton.onClick', telemetryPayload);
 
-			await runWorkflow({
+			await runWorkflowResolvePending({
 				destinationNode: props.nodeName,
 				source: 'RunData.ExecuteNodeButton',
 			});
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 3f4ee2833a..1525610e8f 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -51,6 +51,7 @@ import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { importCurlEventBus, ndvEventBus } from '@/event-bus';
+import { ProjectTypes } from '@/types/projects.types';
 
 const props = withDefaults(
 	defineProps<{
@@ -117,17 +118,29 @@ const hiddenIssuesInputs = ref<string[]>([]);
 const nodeSettings = ref<INodeProperties[]>([]);
 const subConnections = ref<InstanceType<typeof NDVSubConnections> | null>(null);
 
-const isReadOnly = computed(() => props.readOnly || props.foreignCredentials.length > 0);
-
+const currentWorkflowInstance = computed(() => workflowsStore.getCurrentWorkflow());
+const currentWorkflow = computed(() =>
+	workflowsStore.getWorkflowById(currentWorkflowInstance.value.id),
+);
+const hasForeignCredential = computed(() => props.foreignCredentials.length > 0);
+const isHomeProjectTeam = computed(
+	() => currentWorkflow.value.homeProject?.type === ProjectTypes.Team,
+);
+const isReadOnly = computed(
+	() => props.readOnly || (hasForeignCredential.value && !isHomeProjectTeam.value),
+);
 const node = computed(() => ndvStore.activeNode);
 
 const isTriggerNode = computed(() => !!node.value && nodeTypesStore.isTriggerNode(node.value.type));
 
 const isExecutable = computed(() => {
 	if (props.nodeType && node.value) {
-		const workflow = workflowsStore.getCurrentWorkflow();
-		const workflowNode = workflow.getNode(node.value.name);
-		const inputs = NodeHelpers.getNodeInputs(workflow, workflowNode!, props.nodeType);
+		const workflowNode = currentWorkflowInstance.value.getNode(node.value.name);
+		const inputs = NodeHelpers.getNodeInputs(
+			currentWorkflowInstance.value,
+			workflowNode!,
+			props.nodeType,
+		);
 		const inputNames = NodeHelpers.getConnectionTypes(inputs);
 
 		if (!inputNames.includes(NodeConnectionType.Main) && !isTriggerNode.value) {
@@ -195,8 +208,6 @@ const outputPanelEditMode = computed(() => ndvStore.outputPanelEditMode);
 
 const isCommunityNode = computed(() => !!node.value && isCommunityPackageName(node.value.type));
 
-const hasForeignCredential = computed(() => props.foreignCredentials.length > 0);
-
 const usedCredentials = computed(() =>
 	Object.values(workflowsStore.usedCredentials).filter((credential) =>
 		Object.values(node.value?.credentials || []).find(
@@ -1017,7 +1028,7 @@ onBeforeUnmount(() => {
 		</div>
 		<div v-if="node && nodeValid" class="node-parameters-wrapper" data-test-id="node-parameters">
 			<n8n-notice
-				v-if="hasForeignCredential"
+				v-if="hasForeignCredential && !isHomeProjectTeam"
 				:content="
 					$locale.baseText('nodeSettings.hasForeignCredential', {
 						interpolate: { owner: credentialOwnerName },
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index b1ddc35042..f4e1681e17 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -14,6 +14,7 @@ import { useNodeType } from '@/composables/useNodeType';
 import { usePinnedData } from '@/composables/usePinnedData';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
+import { waitingNodeTooltip } from '@/utils/executionUtils';
 
 // Types
 
@@ -348,6 +349,11 @@ const activatePane = () => {
 			</n8n-text>
 		</template>
 
+		<template #node-waiting>
+			<n8n-text :bold="true" color="text-dark" size="large">Waiting for input</n8n-text>
+			<n8n-text v-n8n-html="waitingNodeTooltip()"></n8n-text>
+		</template>
+
 		<template #no-output-data>
 			<n8n-text :bold="true" color="text-dark" size="large">{{
 				$locale.baseText('ndv.output.noOutputData.title')
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 80d0cd890b..313f62fe33 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -177,6 +177,15 @@ const displayValue = computed(() => {
 		if (!nodeType.value || nodeType.value?.codex?.categories?.includes(CORE_NODES_CATEGORY)) {
 			return i18n.baseText('parameterInput.loadOptionsError');
 		}
+
+		if (nodeType.value?.credentials && nodeType.value?.credentials?.length > 0) {
+			const credentialsType = nodeType.value?.credentials[0];
+
+			if (credentialsType.required && !node.value?.credentials) {
+				return i18n.baseText('parameterInput.loadOptionsCredentialsRequired');
+			}
+		}
+
 		return i18n.baseText('parameterInput.loadOptionsErrorService', {
 			interpolate: { service: nodeType.value.displayName },
 		});
@@ -1275,6 +1284,7 @@ onUpdated(async () => {
 					"
 					:title="displayTitle"
 					:placeholder="getPlaceholder()"
+					data-test-id="parameter-input-field"
 					@update:model-value="(valueChanged($event) as undefined) && onUpdateTextInput($event)"
 					@keydown.stop
 					@focus="setFocus"
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 1d08dfa505..146e7c0961 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -29,6 +29,7 @@ import {
 } from '@/utils/nodeTypesUtils';
 import { get, set } from 'lodash-es';
 import { useRouter } from 'vue-router';
+import { captureException } from '@sentry/vue';
 
 const LazyFixedCollectionParameter = defineAsyncComponent(
 	async () => await import('./FixedCollectionParameter.vue'),
@@ -73,7 +74,7 @@ onErrorCaptured((e, component) => {
 	}
 	asyncLoadingError.value = true;
 	console.error(e);
-	window?.Sentry?.captureException(e, {
+	captureException(e, {
 		tags: {
 			asyncLoadingError: true,
 		},
diff --git a/packages/editor-ui/src/components/PersonalizationModal.test.ts b/packages/editor-ui/src/components/PersonalizationModal.test.ts
index a4de7db0fc..a009bf34dc 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.test.ts
+++ b/packages/editor-ui/src/components/PersonalizationModal.test.ts
@@ -15,6 +15,16 @@ import {
 	DEVOPS_AUTOMATION_GOAL_KEY,
 } from '@/constants';
 
+vi.mock('vue-router', () => ({
+	useRouter: () => ({
+		replace: vi.fn(),
+	}),
+	useRoute: () => ({
+		location: {},
+	}),
+	RouterLink: vi.fn(),
+}));
+
 const renderModal = createComponentRenderer(PersonalizationModal, {
 	global: {
 		stubs: {
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 6be5286618..ee7e1ff4d3 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -80,6 +80,7 @@ import {
 	REPORTED_SOURCE_OTHER_KEY,
 	VIEWS,
 	MORE_ONBOARDING_OPTIONS_EXPERIMENT,
+	COMMUNITY_PLUS_ENROLLMENT_MODAL,
 } from '@/constants';
 import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
@@ -91,6 +92,7 @@ import { usePostHog } from '@/stores/posthog.store';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useI18n } from '@/composables/useI18n';
 import { useRoute, useRouter } from 'vue-router';
+import { useUIStore } from '@/stores/ui.store';
 
 const SURVEY_VERSION = 'v4';
 
@@ -104,6 +106,7 @@ const usersStore = useUsersStore();
 const posthogStore = usePostHog();
 const route = useRoute();
 const router = useRouter();
+const uiStore = useUIStore();
 
 const formValues = ref<Record<string, string>>({});
 const isSaving = ref(false);
@@ -547,14 +550,21 @@ const onSave = () => {
 
 const closeDialog = () => {
 	modalBus.emit('close');
-	const isPartOfOnboardingExperiment =
-		posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
-		MORE_ONBOARDING_OPTIONS_EXPERIMENT.control;
-	// In case the redirect to homepage for new users didn't happen
-	// we try again after closing the modal
-	if (route.name !== VIEWS.HOMEPAGE && !isPartOfOnboardingExperiment) {
-		void router.replace({ name: VIEWS.HOMEPAGE });
-	}
+	uiStore.openModalWithData({
+		name: COMMUNITY_PLUS_ENROLLMENT_MODAL,
+		data: {
+			closeCallback: () => {
+				const isPartOfOnboardingExperiment =
+					posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
+					MORE_ONBOARDING_OPTIONS_EXPERIMENT.control;
+				// In case the redirect to homepage for new users didn't happen
+				// we try again after closing the modal
+				if (route.name !== VIEWS.HOMEPAGE && !isPartOfOnboardingExperiment) {
+					void router.replace({ name: VIEWS.HOMEPAGE });
+				}
+			},
+		},
+	});
 };
 
 const onSubmit = async (values: IPersonalizationLatestVersion) => {
diff --git a/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts b/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
index f3cf103386..add92bd45c 100644
--- a/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
@@ -1,5 +1,6 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import ProjectCardBadge from '@/components/Projects/ProjectCardBadge.vue';
+import { truncate } from 'n8n-design-system';
 
 const renderComponent = createComponentRenderer(ProjectCardBadge);
 
@@ -56,6 +57,6 @@ describe('ProjectCardBadge', () => {
 				},
 			},
 		});
-		expect(getByText(result)).toBeVisible();
+		expect(getByText(truncate(result, 20))).toBeVisible();
 	});
 });
diff --git a/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue b/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
index e0ff41f5a8..ef675aa232 100644
--- a/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
@@ -119,7 +119,7 @@ const badgeTooltip = computed(() => {
 <template>
 	<N8nTooltip :disabled="!badgeTooltip" placement="top">
 		<N8nBadge v-if="badgeText" class="mr-xs" theme="tertiary" bold data-test-id="card-badge">
-			{{ badgeText }}
+			<span v-n8n-truncate:20>{{ badgeText }}</span>
 			<N8nIcon v-if="badgeIcon" :icon="badgeIcon" size="small" class="ml-5xs" />
 		</N8nBadge>
 		<template #content>
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceConfirmModal.test.ts b/packages/editor-ui/src/components/Projects/ProjectMoveResourceConfirmModal.test.ts
deleted file mode 100644
index b413550a39..0000000000
--- a/packages/editor-ui/src/components/Projects/ProjectMoveResourceConfirmModal.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia';
-import userEvent from '@testing-library/user-event';
-import { createComponentRenderer } from '@/__tests__/render';
-import { PROJECT_MOVE_RESOURCE_CONFIRM_MODAL } from '@/constants';
-import ProjectMoveResourceConfirmModal from '@/components/Projects/ProjectMoveResourceConfirmModal.vue';
-import { useProjectsStore } from '@/stores/projects.store';
-import { useTelemetry } from '@/composables/useTelemetry';
-
-vi.mock('@/stores/ui.store', () => ({
-	useUIStore: vi.fn().mockReturnValue({
-		modalsById: vi.fn().mockReturnValue(() => {
-			open: true;
-		}),
-		closeModal: vi.fn(),
-	}),
-}));
-
-const renderComponent = createComponentRenderer(ProjectMoveResourceConfirmModal, {
-	global: {
-		stubs: {
-			Modal: {
-				template:
-					'<div role="dialog"><slot name="header" /><slot name="content" /><slot name="footer" /></div>',
-			},
-		},
-	},
-});
-
-let projectsStore: ReturnType<typeof useProjectsStore>;
-let telemetry: ReturnType<typeof useTelemetry>;
-
-describe('ProjectMoveResourceConfirmModal', () => {
-	beforeEach(() => {
-		setActivePinia(createPinia());
-		projectsStore = useProjectsStore();
-		telemetry = useTelemetry();
-	});
-
-	it('should send telemetry when resource moving is confirmed', async () => {
-		vi.spyOn(projectsStore, 'moveResourceToProject').mockResolvedValue();
-
-		const telemetryTrackSpy = vi.spyOn(telemetry, 'track');
-
-		const props = {
-			modalName: PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
-			data: {
-				resourceType: 'workflow',
-				resource: {
-					id: '1',
-				},
-				projectId: '1',
-				projectName: 'My Project',
-			},
-		};
-		const { getByRole, getAllByRole } = renderComponent({ props });
-		const confirmBtn = getByRole('button', { name: /confirm/i });
-		expect(confirmBtn).toBeDisabled();
-		await Promise.all(
-			getAllByRole('checkbox').map(async (checkbox) => await userEvent.click(checkbox)),
-		);
-		expect(confirmBtn).toBeEnabled();
-		await userEvent.click(confirmBtn);
-		expect(telemetryTrackSpy).toHaveBeenCalledWith(
-			'User successfully moved workflow',
-			expect.objectContaining({ workflow_id: '1' }),
-		);
-	});
-});
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceConfirmModal.vue b/packages/editor-ui/src/components/Projects/ProjectMoveResourceConfirmModal.vue
deleted file mode 100644
index dcccb49a34..0000000000
--- a/packages/editor-ui/src/components/Projects/ProjectMoveResourceConfirmModal.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<script lang="ts" setup>
-import { ref, computed, h } from 'vue';
-import type { ICredentialsResponse, IWorkflowDb } from '@/Interface';
-import { useI18n } from '@/composables/useI18n';
-import { useUIStore } from '@/stores/ui.store';
-import { useProjectsStore } from '@/stores/projects.store';
-import Modal from '@/components/Modal.vue';
-import { N8nCheckbox, N8nText } from 'n8n-design-system';
-import { useToast } from '@/composables/useToast';
-import { useTelemetry } from '@/composables/useTelemetry';
-import { VIEWS } from '@/constants';
-import ProjectMoveSuccessToastMessage from '@/components/Projects/ProjectMoveSuccessToastMessage.vue';
-import { ResourceType } from '@/utils/projects.utils';
-
-const props = defineProps<{
-	modalName: string;
-	data: {
-		resource: IWorkflowDb | ICredentialsResponse;
-		resourceType: ResourceType;
-		resourceTypeLabel: string;
-		projectId: string;
-		projectName: string;
-	};
-}>();
-
-const i18n = useI18n();
-const toast = useToast();
-const uiStore = useUIStore();
-const projectsStore = useProjectsStore();
-const telemetry = useTelemetry();
-
-const checks = ref([false, false]);
-const allChecked = computed(() => checks.value.every(Boolean));
-
-const moveResourceLabel = computed(() =>
-	props.data.resourceType === ResourceType.Workflow
-		? i18n.baseText('projects.move.workflow.confirm.modal.label')
-		: i18n.baseText('projects.move.credential.confirm.modal.label'),
-);
-
-const closeModal = () => {
-	uiStore.closeModal(props.modalName);
-};
-
-const confirm = async () => {
-	try {
-		await projectsStore.moveResourceToProject(
-			props.data.resourceType,
-			props.data.resource.id,
-			props.data.projectId,
-		);
-		closeModal();
-		telemetry.track(`User successfully moved ${props.data.resourceType}`, {
-			[`${props.data.resourceType}_id`]: props.data.resource.id,
-			project_from_type: projectsStore.currentProject?.type ?? projectsStore.personalProject?.type,
-		});
-		toast.showToast({
-			title: i18n.baseText('projects.move.resource.success.title', {
-				interpolate: {
-					resourceTypeLabel: props.data.resourceTypeLabel,
-				},
-			}),
-			message: h(ProjectMoveSuccessToastMessage, {
-				routeName:
-					props.data.resourceType === ResourceType.Workflow
-						? VIEWS.PROJECTS_WORKFLOWS
-						: VIEWS.PROJECTS_CREDENTIALS,
-				resource: props.data.resource,
-				resourceTypeLabel: props.data.resourceTypeLabel,
-				projectId: props.data.projectId,
-				projectName: props.data.projectName,
-			}),
-			type: 'success',
-		});
-	} catch (error) {
-		toast.showError(
-			error.message,
-			i18n.baseText('projects.move.resource.error.title', {
-				interpolate: {
-					resourceTypeLabel: props.data.resourceTypeLabel,
-					resourceName: props.data.resource.name,
-				},
-			}),
-		);
-	}
-};
-</script>
-<template>
-	<Modal width="500px" :name="props.modalName" data-test-id="project-move-resource-confirm-modal">
-		<template #header>
-			<N8nHeading tag="h2" size="xlarge" class="mb-m">
-				{{ i18n.baseText('projects.move.resource.confirm.modal.title') }}
-			</N8nHeading>
-		</template>
-		<template #content>
-			<N8nCheckbox v-model="checks[0]" :label="moveResourceLabel" />
-			<N8nCheckbox v-model="checks[1]">
-				<N8nText>
-					<i18n-t keypath="projects.move.resource.confirm.modal.label">
-						<template #resourceTypeLabel>{{ props.data.resourceTypeLabel }}</template>
-						<template #numberOfUsers>{{
-							i18n.baseText('projects.move.resource.confirm.modal.numberOfUsers', {
-								interpolate: {
-									numberOfUsers: props.data.resource.sharedWithProjects?.length ?? 0,
-								},
-								adjustToNumber: props.data.resource.sharedWithProjects?.length,
-							})
-						}}</template>
-					</i18n-t>
-				</N8nText>
-			</N8nCheckbox>
-		</template>
-		<template #footer>
-			<div :class="$style.buttons">
-				<N8nButton type="secondary" text class="mr-2xs" @click="closeModal">
-					{{ i18n.baseText('generic.cancel') }}
-				</N8nButton>
-				<N8nButton :disabled="!allChecked" type="primary" @click="confirm">
-					{{ i18n.baseText('projects.move.resource.confirm.modal.button.confirm') }}
-				</N8nButton>
-			</div>
-		</template>
-	</Modal>
-</template>
-
-<style lang="scss" module>
-.buttons {
-	display: flex;
-	justify-content: flex-end;
-}
-</style>
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
index 68dc7b4f3d..b70d843b6d 100644
--- a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
@@ -1,8 +1,10 @@
-import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
 import { createComponentRenderer } from '@/__tests__/render';
-import { PROJECT_MOVE_RESOURCE_CONFIRM_MODAL } from '@/constants';
+import { PROJECT_MOVE_RESOURCE_MODAL } from '@/constants';
 import ProjectMoveResourceModal from '@/components/Projects/ProjectMoveResourceModal.vue';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { mockedStore } from '@/__tests__/utils';
+import { useProjectsStore } from '@/stores/projects.store';
 
 const renderComponent = createComponentRenderer(ProjectMoveResourceModal, {
 	global: {
@@ -19,28 +21,67 @@ let telemetry: ReturnType<typeof useTelemetry>;
 
 describe('ProjectMoveResourceModal', () => {
 	beforeEach(() => {
-		setActivePinia(createPinia());
 		telemetry = useTelemetry();
 	});
 
 	it('should send telemetry when mounted', async () => {
+		const pinia = createTestingPinia();
 		const telemetryTrackSpy = vi.spyOn(telemetry, 'track');
 
+		const projectsStore = mockedStore(useProjectsStore);
+		projectsStore.availableProjects = [
+			{
+				id: '1',
+				name: 'My Project',
+				type: 'personal',
+				role: 'project:personalOwner',
+				createdAt: '2021-01-01T00:00:00.000Z',
+				updatedAt: '2021-01-01T00:00:00.000Z',
+			},
+		];
+
 		const props = {
-			modalName: PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
+			modalName: PROJECT_MOVE_RESOURCE_MODAL,
 			data: {
 				resourceType: 'workflow',
+				resourceTypeLabel: 'Workflow',
 				resource: {
 					id: '1',
+					homeProject: {
+						id: '2',
+						name: 'My Project',
+					},
 				},
-				projectId: '1',
-				projectName: 'My Project',
 			},
 		};
-		renderComponent({ props });
+		renderComponent({ props, pinia });
 		expect(telemetryTrackSpy).toHaveBeenCalledWith(
 			'User clicked to move a workflow',
 			expect.objectContaining({ workflow_id: '1' }),
 		);
 	});
+
+	it('should show no available projects message', async () => {
+		const pinia = createTestingPinia();
+
+		const projectsStore = mockedStore(useProjectsStore);
+		projectsStore.availableProjects = [];
+
+		const props = {
+			modalName: PROJECT_MOVE_RESOURCE_MODAL,
+			data: {
+				resourceType: 'workflow',
+				resourceTypeLabel: 'Workflow',
+				resource: {
+					id: '1',
+					homeProject: {
+						id: '2',
+						name: 'My Project',
+					},
+				},
+			},
+		};
+		const { getByText } = renderComponent({ props, pinia });
+		expect(getByText(/Currently there are not any projects or users available/)).toBeVisible();
+	});
 });
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
index d115a18f39..1f30e1d1b3 100644
--- a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
@@ -1,14 +1,17 @@
 <script lang="ts" setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed, onMounted, h } from 'vue';
 import type { ICredentialsResponse, IWorkflowDb } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 import { useUIStore } from '@/stores/ui.store';
 import { useProjectsStore } from '@/stores/projects.store';
 import Modal from '@/components/Modal.vue';
-import { PROJECT_MOVE_RESOURCE_CONFIRM_MODAL } from '@/constants';
-import type { ResourceType } from '@/utils/projects.utils';
-import { splitName } from '@/utils/projects.utils';
+import { VIEWS } from '@/constants';
+import { ResourceType, splitName } from '@/utils/projects.utils';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { ProjectTypes } from '@/types/projects.types';
+import ProjectMoveSuccessToastMessage from '@/components/Projects/ProjectMoveSuccessToastMessage.vue';
+import { useToast } from '@/composables/useToast';
+import { getResourcePermissions } from '@/permissions';
 
 const props = defineProps<{
 	modalName: string;
@@ -21,17 +24,37 @@ const props = defineProps<{
 
 const i18n = useI18n();
 const uiStore = useUIStore();
+const toast = useToast();
 const projectsStore = useProjectsStore();
 const telemetry = useTelemetry();
 
+const filter = ref('');
 const projectId = ref<string | null>(null);
-const processedName = computed(() => {
-	const { name, email } = splitName(props.data.resource.homeProject?.name ?? '');
+const processedName = computed(
+	() => processProjectName(props.data.resource.homeProject?.name ?? '') ?? '',
+);
+const availableProjects = computed(() =>
+	projectsStore.availableProjects
+		.filter(
+			(p) =>
+				p.name?.toLowerCase().includes(filter.value.toLowerCase()) &&
+				p.id !== props.data.resource.homeProject?.id &&
+				(!p.scopes || getResourcePermissions(p.scopes)[props.data.resourceType].create),
+		)
+		.sort((a, b) => a.name?.localeCompare(b.name ?? '') ?? 0),
+);
+const selectedProject = computed(() =>
+	availableProjects.value.find((p) => p.id === projectId.value),
+);
+const isResourceInTeamProject = computed(() => isHomeProjectTeam(props.data.resource));
+
+const isHomeProjectTeam = (resource: IWorkflowDb | ICredentialsResponse) =>
+	resource.homeProject?.type === ProjectTypes.Team;
+
+const processProjectName = (projectName: string) => {
+	const { name, email } = splitName(projectName);
 	return name ?? email;
-});
-const availableProjects = computed(() => {
-	return projectsStore.teamProjects.filter((p) => p.id !== props.data.resource.homeProject?.id);
-});
+};
 
 const updateProject = (value: string) => {
 	projectId.value = value;
@@ -41,18 +64,53 @@ const closeModal = () => {
 	uiStore.closeModal(props.modalName);
 };
 
-const next = () => {
-	closeModal();
-	uiStore.openModalWithData({
-		name: PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
-		data: {
-			resource: props.data.resource,
-			resourceType: props.data.resourceType,
-			resourceTypeLabel: props.data.resourceTypeLabel,
-			projectId: projectId.value,
-			projectName: availableProjects.value.find((p) => p.id === projectId.value)?.name ?? '',
-		},
-	});
+const setFilter = (query: string) => {
+	filter.value = query;
+};
+
+const moveResource = async () => {
+	if (!selectedProject.value) return;
+	try {
+		await projectsStore.moveResourceToProject(
+			props.data.resourceType,
+			props.data.resource.id,
+			selectedProject.value.id,
+		);
+		closeModal();
+		telemetry.track(`User successfully moved ${props.data.resourceType}`, {
+			[`${props.data.resourceType}_id`]: props.data.resource.id,
+			project_from_type: projectsStore.currentProject?.type ?? projectsStore.personalProject?.type,
+		});
+		toast.showToast({
+			title: i18n.baseText('projects.move.resource.success.title', {
+				interpolate: {
+					resourceTypeLabel: props.data.resourceTypeLabel,
+				},
+			}),
+			message: h(ProjectMoveSuccessToastMessage, {
+				routeName:
+					props.data.resourceType === ResourceType.Workflow
+						? VIEWS.PROJECTS_WORKFLOWS
+						: VIEWS.PROJECTS_CREDENTIALS,
+				resource: props.data.resource,
+				resourceType: props.data.resourceType,
+				resourceTypeLabel: props.data.resourceTypeLabel,
+				targetProject: selectedProject.value,
+			}),
+			type: 'success',
+			duration: 8000,
+		});
+	} catch (error) {
+		toast.showError(
+			error.message,
+			i18n.baseText('projects.move.resource.error.title', {
+				interpolate: {
+					resourceTypeLabel: props.data.resourceTypeLabel,
+					resourceName: props.data.resource.name,
+				},
+			}),
+		);
+	}
 };
 
 onMounted(() => {
@@ -65,7 +123,7 @@ onMounted(() => {
 <template>
 	<Modal width="500px" :name="props.modalName" data-test-id="project-move-resource-modal">
 		<template #header>
-			<N8nHeading tag="h2" size="xlarge" class="mb-m">
+			<N8nHeading tag="h2" size="xlarge" class="mb-m pr-s">
 				{{
 					i18n.baseText('projects.move.resource.modal.title', {
 						interpolate: { resourceTypeLabel: props.data.resourceTypeLabel },
@@ -77,20 +135,37 @@ onMounted(() => {
 					<template #resourceName
 						><strong>{{ props.data.resource.name }}</strong></template
 					>
-					<template #resourceHomeProjectName>{{ processedName }}</template>
-					<template #resourceTypeLabel>{{ props.data.resourceTypeLabel }}</template>
+					<template v-if="isResourceInTeamProject" #inTeamProject>
+						<i18n-t keypath="projects.move.resource.modal.message.team">
+							<template #resourceHomeProjectName
+								><strong>{{ processedName }}</strong></template
+							>
+						</i18n-t>
+					</template>
+					<template v-else #inPersonalProject>
+						<i18n-t keypath="projects.move.resource.modal.message.personal">
+							<template #resourceHomeProjectName
+								><strong>{{ processedName }}</strong></template
+							>
+						</i18n-t>
+					</template>
 				</i18n-t>
 			</N8nText>
 		</template>
 		<template #content>
-			<div>
+			<div v-if="availableProjects.length">
 				<N8nSelect
-					class="mr-2xs"
+					class="mr-2xs mb-xs"
 					:model-value="projectId"
-					size="small"
+					:filterable="true"
+					:filter-method="setFilter"
+					:placeholder="i18n.baseText('projects.move.resource.modal.selectPlaceholder')"
 					data-test-id="project-move-resource-modal-select"
 					@update:model-value="updateProject"
 				>
+					<template #prefix>
+						<N8nIcon icon="search" />
+					</template>
 					<N8nOption
 						v-for="p in availableProjects"
 						:key="p.id"
@@ -98,15 +173,45 @@ onMounted(() => {
 						:label="p.name"
 					></N8nOption>
 				</N8nSelect>
+				<N8nText>
+					<i18n-t keypath="projects.move.resource.modal.message.sharingNote">
+						<template #note
+							><strong>{{
+								i18n.baseText('projects.move.resource.modal.message.note')
+							}}</strong></template
+						>
+						<template #resourceTypeLabel>{{ props.data.resourceTypeLabel }}</template>
+					</i18n-t>
+					<span v-if="props.data.resource.sharedWithProjects?.length ?? 0 > 0">
+						<br />
+						{{
+							i18n.baseText('projects.move.resource.modal.message.sharingInfo', {
+								adjustToNumber: props.data.resource.sharedWithProjects?.length,
+								interpolate: {
+									numberOfProjects: props.data.resource.sharedWithProjects?.length ?? 0,
+								},
+							})
+						}}</span
+					>
+				</N8nText>
 			</div>
+			<N8nText v-else>{{
+				i18n.baseText('projects.move.resource.modal.message.noProjects', {
+					interpolate: { resourceTypeLabel: props.data.resourceTypeLabel },
+				})
+			}}</N8nText>
 		</template>
 		<template #footer>
 			<div :class="$style.buttons">
 				<N8nButton type="secondary" text class="mr-2xs" @click="closeModal">
 					{{ i18n.baseText('generic.cancel') }}
 				</N8nButton>
-				<N8nButton :disabled="!projectId" type="primary" @click="next">
-					{{ i18n.baseText('generic.next') }}
+				<N8nButton :disabled="!projectId" type="primary" @click="moveResource">
+					{{
+						i18n.baseText('projects.move.resource.modal.button', {
+							interpolate: { resourceTypeLabel: props.data.resourceTypeLabel },
+						})
+					}}
 				</N8nButton>
 			</div>
 		</template>
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.test.ts b/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.test.ts
new file mode 100644
index 0000000000..1900173093
--- /dev/null
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.test.ts
@@ -0,0 +1,87 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import ProjectMoveSuccessToastMessage from '@/components/Projects/ProjectMoveSuccessToastMessage.vue';
+import { ResourceType } from '@/utils/projects.utils';
+import { VIEWS } from '@/constants';
+import { ProjectTypes } from '@/types/projects.types';
+
+const renderComponent = createComponentRenderer(ProjectMoveSuccessToastMessage, {
+	global: {
+		stubs: {
+			'router-link': {
+				template: '<a href="#"><slot /></a>',
+			},
+		},
+	},
+});
+
+describe('ProjectMoveSuccessToastMessage', () => {
+	it('should show credentials message if the resource is a workflow', async () => {
+		const props = {
+			routeName: VIEWS.PROJECTS_WORKFLOWS,
+			resource: {
+				id: '1',
+				name: 'My Workflow',
+				homeProject: {
+					id: '2',
+					name: 'My Project',
+				},
+			},
+			resourceType: ResourceType.Workflow,
+			resourceTypeLabel: 'Workflow',
+			targetProject: {
+				id: '2',
+				name: 'My Project',
+			},
+		};
+		const { getByText } = renderComponent({ props });
+		expect(getByText(/Please double check any credentials/)).toBeInTheDocument();
+	});
+
+	it('should show link if the target project type is team project', async () => {
+		const props = {
+			routeName: VIEWS.PROJECTS_WORKFLOWS,
+			resource: {
+				id: '1',
+				name: 'My Workflow',
+				homeProject: {
+					id: '2',
+					name: 'My Project',
+				},
+			},
+			resourceType: ResourceType.Workflow,
+			resourceTypeLabel: 'workflow',
+			targetProject: {
+				id: '2',
+				name: 'Team Project',
+				type: ProjectTypes.Team,
+			},
+		};
+		const { getByRole } = renderComponent({ props });
+		expect(getByRole('link')).toBeInTheDocument();
+	});
+
+	it('should show only general if the resource is credential and moved to a personal project', async () => {
+		const props = {
+			routeName: VIEWS.PROJECTS_WORKFLOWS,
+			resource: {
+				id: '1',
+				name: 'Notion API',
+				homeProject: {
+					id: '2',
+					name: 'My Project',
+				},
+			},
+			resourceType: ResourceType.Credential,
+			resourceTypeLabel: 'credential',
+			targetProject: {
+				id: '2',
+				name: 'Personal Project',
+				type: ProjectTypes.Personal,
+			},
+		};
+		const { getByText, queryByText, queryByRole } = renderComponent({ props });
+		expect(getByText(/credential was moved to /)).toBeInTheDocument();
+		expect(queryByText(/Please double check any credentials/)).not.toBeInTheDocument();
+		expect(queryByRole('link')).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue b/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
index bd5644c017..8bf8fe2af4 100644
--- a/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
@@ -1,32 +1,57 @@
 <script lang="ts" setup>
+import { computed } from 'vue';
+import { truncate } from 'n8n-design-system';
 import type { ICredentialsResponse, IWorkflowDb } from '@/Interface';
+import { ResourceType, splitName } from '@/utils/projects.utils';
+import type { ProjectListItem } from '@/types/projects.types';
+import { ProjectTypes } from '@/types/projects.types';
 
 const props = defineProps<{
 	routeName: string;
 	resource: IWorkflowDb | ICredentialsResponse;
+	resourceType: ResourceType;
 	resourceTypeLabel: string;
-	projectId: string;
-	projectName: string;
+	targetProject: ProjectListItem;
 }>();
+
+const isWorkflow = computed(() => props.resourceType === ResourceType.Workflow);
+const isTargetProjectTeam = computed(() => props.targetProject.type === ProjectTypes.Team);
+const projectName = computed(() => {
+	const { name, email } = splitName(props.targetProject?.name ?? '');
+	return truncate(name ?? email ?? '', 25);
+});
 </script>
 <template>
 	<i18n-t keypath="projects.move.resource.success.message">
 		<template #resourceTypeLabel>{{ props.resourceTypeLabel }}</template>
-		<template #resourceName>{{ props.resource.name }}</template>
-		<template #targetProjectName>{{ props.projectName }}</template>
-		<template #link>
-			<router-link
-				:to="{
-					name: props.routeName,
-					params: { projectId: props.projectId },
-				}"
-			>
-				<p class="pt-s">
+		<template #resourceName
+			><strong>{{ props.resource.name }}</strong></template
+		>
+		<template #targetProjectName
+			><strong>{{ projectName }}</strong></template
+		>
+		<template v-if="isWorkflow" #workflow>
+			<N8nText tag="p" class="pt-xs">
+				<i18n-t keypath="projects.move.resource.success.message.workflow">
+					<template #targetProjectName
+						><strong>{{ projectName }}</strong></template
+					>
+				</i18n-t>
+			</N8nText>
+		</template>
+		<template v-if="isTargetProjectTeam" #link>
+			<p class="pt-s">
+				<router-link
+					:to="{
+						name: props.routeName,
+						params: { projectId: props.targetProject.id },
+					}"
+				>
 					<i18n-t keypath="projects.move.resource.success.link">
-						<template #targetProjectName>{{ props.projectName }}</template>
+						<template #targetProjectName>{{ projectName }}</template>
 					</i18n-t>
-				</p>
-			</router-link>
+				</router-link>
+			</p>
 		</template>
 	</i18n-t>
 </template>
diff --git a/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue b/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
index c138b695db..55e330dc5f 100644
--- a/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
@@ -67,5 +67,9 @@ const processedName = computed(() => {
 .text {
 	display: flex;
 	flex-direction: column;
+
+	p {
+		margin: 0;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 4885ee7ed9..cfed2a76d2 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -218,6 +218,13 @@ export default defineComponent({
 		isReadOnlyRoute() {
 			return this.$route?.meta?.readOnlyCanvas === true;
 		},
+		isWaitNodeWaiting() {
+			return (
+				this.workflowExecution?.status === 'waiting' &&
+				this.workflowExecution.data?.waitTill &&
+				this.workflowExecution?.data?.resultData?.lastNodeExecuted === this.node?.name
+			);
+		},
 		activeNode(): INodeUi | null {
 			return this.ndvStore.activeNode;
 		},
@@ -239,8 +246,8 @@ export default defineComponent({
 		isSchemaView(): boolean {
 			return this.displayMode === 'schema';
 		},
-		isInputSchemaView(): boolean {
-			return this.isSchemaView && this.paneType === 'input';
+		displaysMultipleNodes(): boolean {
+			return this.isSchemaView && this.paneType === 'input' && this.nodes.length > 0;
 		},
 		isTriggerNode(): boolean {
 			if (this.node === null) {
@@ -1300,7 +1307,7 @@ export default defineComponent({
 		</div>
 
 		<div
-			v-if="maxRunIndex > 0 && !isInputSchemaView"
+			v-if="maxRunIndex > 0 && !displaysMultipleNodes"
 			v-show="!editMode.enabled"
 			:class="$style.runSelector"
 		>
@@ -1342,7 +1349,7 @@ export default defineComponent({
 			<slot name="run-info"></slot>
 		</div>
 
-		<slot v-if="!isInputSchemaView" name="before-data" />
+		<slot v-if="!displaysMultipleNodes" name="before-data" />
 
 		<n8n-callout
 			v-for="hint in getNodeHints()"
@@ -1354,7 +1361,7 @@ export default defineComponent({
 		</n8n-callout>
 
 		<div
-			v-if="maxOutputIndex > 0 && branches.length > 1 && !isInputSchemaView"
+			v-if="maxOutputIndex > 0 && branches.length > 1 && !displaysMultipleNodes"
 			:class="$style.outputs"
 			data-test-id="branches"
 		>
@@ -1375,7 +1382,7 @@ export default defineComponent({
 				hasNodeRun &&
 				((dataCount > 0 && maxRunIndex === 0) || search) &&
 				!isArtificialRecoveredEventItem &&
-				!isInputSchemaView
+				!displaysMultipleNodes
 			"
 			v-show="!editMode.enabled && !hasRunError"
 			:class="[$style.itemsCount, { [$style.muted]: paneType === 'input' && maxRunIndex === 0 }]"
@@ -1432,12 +1439,19 @@ export default defineComponent({
 				<NodeErrorView :error="subworkflowExecutionError" :class="$style.errorDisplay" />
 			</div>
 
-			<div v-else-if="!hasNodeRun && !(isInputSchemaView && node?.disabled)" :class="$style.center">
+			<div v-else-if="isWaitNodeWaiting" :class="$style.center">
+				<slot name="node-waiting">xxx</slot>
+			</div>
+
+			<div
+				v-else-if="!hasNodeRun && !(displaysMultipleNodes && node?.disabled)"
+				:class="$style.center"
+			>
 				<slot name="node-not-run"></slot>
 			</div>
 
 			<div
-				v-else-if="paneType === 'input' && !isInputSchemaView && node?.disabled"
+				v-else-if="paneType === 'input' && !displaysMultipleNodes && node?.disabled"
 				:class="$style.center"
 			>
 				<n8n-text>
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
index 50e5afd31f..d4b5f01e18 100644
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ b/packages/editor-ui/src/components/RunDataSchema.vue
@@ -95,7 +95,7 @@ const nodes = computed(() => {
 
 			return {
 				node: fullNode,
-				connectedOutputIndexes: node.indicies,
+				connectedOutputIndexes: node.indicies.length > 0 ? node.indicies : [0],
 				depth: node.depth,
 				itemsCount,
 				nodeType,
@@ -264,7 +264,10 @@ watch(
 </script>
 
 <template>
-	<div v-if="paneType === 'input'" :class="[$style.schemaWrapper, { highlightSchema: highlight }]">
+	<div
+		v-if="paneType === 'input' && nodes.length > 0"
+		:class="[$style.schemaWrapper, { highlightSchema: highlight }]"
+	>
 		<div v-if="search && nodes.length > 0 && filteredNodes.length === 0" :class="$style.noMatch">
 			<n8n-text tag="h3" size="large">{{
 				$locale.baseText('ndv.search.noNodeMatch.title')
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 67f0ecea1d..59c0879224 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -390,25 +390,29 @@ export default defineComponent({
 <template>
 	<div :class="[$style.dataDisplay, { [$style.highlight]: highlight }]">
 		<table v-if="tableData.columns && tableData.columns.length === 0" :class="$style.table">
-			<tr>
-				<th :class="$style.emptyCell"></th>
-				<th :class="$style.tableRightMargin"></th>
-			</tr>
-			<tr
-				v-for="(_, index1) in tableData.data"
-				:key="index1"
-				:class="{ [$style.hoveringRow]: isHoveringRow(index1) }"
-			>
-				<td
-					:data-row="index1"
-					:data-col="0"
-					@mouseenter="onMouseEnterCell"
-					@mouseleave="onMouseLeaveCell"
+			<thead>
+				<tr>
+					<th :class="$style.emptyCell"></th>
+					<th :class="$style.tableRightMargin"></th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr
+					v-for="(_, index1) in tableData.data"
+					:key="index1"
+					:class="{ [$style.hoveringRow]: isHoveringRow(index1) }"
 				>
-					<n8n-info-tip>{{ $locale.baseText('runData.emptyItemHint') }}</n8n-info-tip>
-				</td>
-				<td :class="$style.tableRightMargin"></td>
-			</tr>
+					<td
+						:data-row="index1"
+						:data-col="0"
+						@mouseenter="onMouseEnterCell"
+						@mouseleave="onMouseLeaveCell"
+					>
+						<n8n-info-tip>{{ $locale.baseText('runData.emptyItemHint') }}</n8n-info-tip>
+					</td>
+					<td :class="$style.tableRightMargin"></td>
+				</tr>
+			</tbody>
 		</table>
 		<table v-else :class="$style.table">
 			<thead>
diff --git a/packages/editor-ui/src/components/SSOLogin.vue b/packages/editor-ui/src/components/SSOLogin.vue
index 12e956f23e..83dd4698fb 100644
--- a/packages/editor-ui/src/components/SSOLogin.vue
+++ b/packages/editor-ui/src/components/SSOLogin.vue
@@ -53,7 +53,8 @@ const onSSOLogin = async () => {
 	span {
 		position: relative;
 		display: inline-block;
-		padding: var(--spacing-xl) var(--spacing-l);
+		margin: var(--spacing-2xs) auto;
+		padding: var(--spacing-l);
 		background: var(--color-background-xlight);
 	}
 }
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index 9888d6253d..0d11628901 100644
--- a/packages/editor-ui/src/components/Sticky.vue
+++ b/packages/editor-ui/src/components/Sticky.vue
@@ -1,19 +1,12 @@
-<script lang="ts">
-import { defineComponent, ref } from 'vue';
-import type { PropType, StyleValue } from 'vue';
-import { mapStores } from 'pinia';
-
+<script setup lang="ts">
+import { ref, computed, onMounted, nextTick } from 'vue';
+import type { StyleValue } from 'vue';
 import { onClickOutside } from '@vueuse/core';
+import type { Workflow } from 'n8n-workflow';
 
 import { isNumber, isString } from '@/utils/typeGuards';
-import type {
-	INodeUi,
-	INodeUpdatePropertiesInformation,
-	IUpdateInformation,
-	XYPosition,
-} from '@/Interface';
+import type { INodeUi, XYPosition } from '@/Interface';
 
-import type { INodeTypeDescription, Workflow } from 'n8n-workflow';
 import { QUICKSTART_NOTE_NAME } from '@/constants';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -25,313 +18,280 @@ import { GRID_SIZE } from '@/utils/nodeViewUtils';
 import { useToast } from '@/composables/useToast';
 import { assert } from '@/utils/assert';
 import type { BrowserJsPlumbInstance } from '@jsplumb/browser-ui';
-import { useCanvasStore } from '@/stores/canvas.store';
-import { useHistoryStore } from '@/stores/history.store';
 import { useNodeBase } from '@/composables/useNodeBase';
+import { useTelemetry } from '@/composables/useTelemetry';
 
-export default defineComponent({
-	name: 'Sticky',
-	props: {
-		nodeViewScale: {
-			type: Number,
-			default: 1,
-		},
-		gridSize: {
-			type: Number,
-			default: GRID_SIZE,
-		},
-		name: {
-			type: String,
-			required: true,
-		},
-		instance: {
-			type: Object as PropType<BrowserJsPlumbInstance>,
-			required: true,
-		},
-		isReadOnly: {
-			type: Boolean,
-		},
-		isActive: {
-			type: Boolean,
-		},
-		hideActions: {
-			type: Boolean,
-		},
-		disableSelecting: {
-			type: Boolean,
-		},
-		showCustomTooltip: {
-			type: Boolean,
-		},
-		workflow: {
-			type: Object as PropType<Workflow>,
-			required: true,
-		},
+const props = withDefaults(
+	defineProps<{
+		nodeViewScale?: number;
+		gridSize?: number;
+		name: string;
+		instance: BrowserJsPlumbInstance;
+		isReadOnly?: boolean;
+		isActive?: boolean;
+		hideActions?: boolean;
+		disableSelecting?: boolean;
+		showCustomTooltip?: boolean;
+		workflow: Workflow;
+	}>(),
+	{
+		nodeViewScale: 1,
+		gridSize: GRID_SIZE,
 	},
-	emits: { removeNode: null, nodeSelected: null },
-	setup(props, { emit }) {
-		const deviceSupport = useDeviceSupport();
-		const toast = useToast();
-		const forceActions = ref(false);
-		const isColorPopoverVisible = ref(false);
+);
 
-		const stickOptions = ref<HTMLElement>();
+defineOptions({ name: 'Sticky' });
 
-		const setForceActions = (value: boolean) => {
-			forceActions.value = value;
-		};
-		const setColorPopoverVisible = (value: boolean) => {
-			isColorPopoverVisible.value = value;
-		};
+const emit = defineEmits<{
+	removeNode: [string];
+	nodeSelected: [string, boolean, boolean];
+}>();
 
-		const contextMenu = useContextMenu((action) => {
-			if (action === 'change_color') {
-				setForceActions(true);
-				setColorPopoverVisible(true);
-			}
-		});
+const deviceSupport = useDeviceSupport();
+const telemetry = useTelemetry();
+const toast = useToast();
+const ndvStore = useNDVStore();
+const nodeTypesStore = useNodeTypesStore();
+const uiStore = useUIStore();
+const workflowsStore = useWorkflowsStore();
 
-		const nodeBase = useNodeBase({
-			name: props.name,
-			instance: props.instance,
-			workflowObject: props.workflow,
-			isReadOnly: props.isReadOnly,
-			emit: emit as (event: string, ...args: unknown[]) => void,
-		});
+const isResizing = ref<boolean>(false);
+const isTouchActive = ref<boolean>(false);
+const forceActions = ref(false);
+const isColorPopoverVisible = ref(false);
+const stickOptions = ref<HTMLElement>();
 
-		onClickOutside(stickOptions, () => setColorPopoverVisible(false));
+const setForceActions = (value: boolean) => {
+	forceActions.value = value;
+};
 
-		return {
-			deviceSupport,
-			toast,
-			contextMenu,
-			forceActions,
-			...nodeBase,
-			setForceActions,
-			isColorPopoverVisible,
-			setColorPopoverVisible,
-			stickOptions,
-		};
-	},
-	data() {
-		return {
-			isResizing: false,
-			isTouchActive: false,
-		};
-	},
-	computed: {
-		...mapStores(
-			useNodeTypesStore,
-			useUIStore,
-			useNDVStore,
-			useCanvasStore,
-			useWorkflowsStore,
-			useHistoryStore,
-		),
-		data(): INodeUi | null {
-			return this.workflowsStore.getNodeByName(this.name);
-		},
-		nodeId(): string {
-			return this.data?.id || '';
-		},
-		defaultText(): string {
-			if (!this.nodeType) {
-				return '';
-			}
-			const properties = this.nodeType.properties;
-			const content = properties.find((property) => property.name === 'content');
+const setColorPopoverVisible = (value: boolean) => {
+	isColorPopoverVisible.value = value;
+};
 
-			return content && isString(content.default) ? content.default : '';
-		},
-		isSelected(): boolean {
-			return (
-				this.uiStore.getSelectedNodes.find((node: INodeUi) => node.name === this.data?.name) !==
-				undefined
-			);
-		},
-		nodeType(): INodeTypeDescription | null {
-			return this.data && this.nodeTypesStore.getNodeType(this.data.type, this.data.typeVersion);
-		},
-		node(): INodeUi | null {
-			// same as this.data but reactive..
-			return this.workflowsStore.getNodeByName(this.name);
-		},
-		position(): XYPosition {
-			if (this.node) {
-				return this.node.position;
-			} else {
-				return [0, 0];
-			}
-		},
-		height(): number {
-			return this.node && isNumber(this.node.parameters.height) ? this.node.parameters.height : 0;
-		},
-		width(): number {
-			return this.node && isNumber(this.node.parameters.width) ? this.node.parameters.width : 0;
-		},
-		stickySize(): StyleValue {
-			const returnStyles: {
-				[key: string]: string | number;
-			} = {
-				height: this.height + 'px',
-				width: this.width + 'px',
-			};
-
-			return returnStyles;
-		},
-		stickyPosition(): StyleValue {
-			const returnStyles: {
-				[key: string]: string | number;
-			} = {
-				left: this.position[0] + 'px',
-				top: this.position[1] + 'px',
-				zIndex: this.isActive ? 9999999 : -1 * Math.floor((this.height * this.width) / 1000),
-			};
-
-			return returnStyles;
-		},
-		showActions(): boolean {
-			return (
-				!(this.hideActions || this.isReadOnly || this.workflowRunning || this.isResizing) ||
-				this.forceActions
-			);
-		},
-		workflowRunning(): boolean {
-			return this.uiStore.isActionActive['workflowRunning'];
-		},
-	},
-	mounted() {
-		// Initialize the node
-		if (this.data !== null) {
-			try {
-				this.addNode(this.data);
-			} catch (error) {
-				// This breaks when new nodes are loaded into store but workflow tab is not currently active
-				// Shouldn't affect anything
-			}
-		}
-	},
-	methods: {
-		onShowPopover() {
-			this.setForceActions(true);
-		},
-		onHidePopover() {
-			this.setForceActions(false);
-		},
-		async deleteNode() {
-			assert(this.data);
-			// Wait a tick else vue causes problems because the data is gone
-			await this.$nextTick();
-			this.$emit('removeNode', this.data.name);
-		},
-		changeColor(index: number) {
-			this.workflowsStore.updateNodeProperties({
-				name: this.name,
-				properties: {
-					parameters: {
-						...this.node?.parameters,
-						color: index,
-					},
-					position: this.node?.position ?? [0, 0],
-				},
-			});
-		},
-		onEdit(edit: boolean) {
-			if (edit && !this.isActive && this.node) {
-				this.ndvStore.activeNodeName = this.node.name;
-			} else if (this.isActive && !edit) {
-				this.ndvStore.activeNodeName = null;
-			}
-		},
-		onMarkdownClick(link: HTMLAnchorElement) {
-			if (link) {
-				const isOnboardingNote = this.name === QUICKSTART_NOTE_NAME;
-				const isWelcomeVideo = link.querySelector('img[alt="n8n quickstart video"]');
-				const type =
-					isOnboardingNote && isWelcomeVideo
-						? 'welcome_video'
-						: isOnboardingNote && link.getAttribute('href') === '/templates'
-							? 'templates'
-							: 'other';
-
-				this.$telemetry.track('User clicked note link', { type });
-			}
-		},
-		onInputChange(content: string) {
-			if (!this.node) {
-				return;
-			}
-			this.node.parameters.content = content;
-			this.setParameters({ content });
-		},
-		onResizeStart() {
-			this.isResizing = true;
-			if (!this.isSelected && this.node) {
-				this.$emit('nodeSelected', this.node.name, false, true);
-			}
-		},
-		onResize({ height, width, dX, dY }: { width: number; height: number; dX: number; dY: number }) {
-			if (!this.node) {
-				return;
-			}
-			if (dX !== 0 || dY !== 0) {
-				this.setPosition([this.node.position[0] + (dX || 0), this.node.position[1] + (dY || 0)]);
-			}
-
-			this.setParameters({ height, width });
-		},
-		onResizeEnd() {
-			this.isResizing = false;
-		},
-		setParameters(params: { content?: string; height?: number; width?: number; color?: string }) {
-			if (this.node) {
-				const nodeParameters = {
-					content: isString(params.content) ? params.content : this.node.parameters.content,
-					height: isNumber(params.height) ? params.height : this.node.parameters.height,
-					width: isNumber(params.width) ? params.width : this.node.parameters.width,
-					color: isString(params.color) ? params.color : this.node.parameters.color,
-				};
-
-				const updateInformation: IUpdateInformation = {
-					key: this.node.id,
-					name: this.node.name,
-					value: nodeParameters,
-				};
-
-				this.workflowsStore.setNodeParameters(updateInformation);
-			}
-		},
-		setPosition(position: XYPosition) {
-			if (!this.node) {
-				return;
-			}
-
-			const updateInformation: INodeUpdatePropertiesInformation = {
-				name: this.node.name,
-				properties: {
-					position,
-				},
-			};
-
-			this.workflowsStore.updateNodeProperties(updateInformation);
-		},
-		touchStart() {
-			if (this.deviceSupport.isTouchDevice && !this.deviceSupport.isMacOs && !this.isTouchActive) {
-				this.isTouchActive = true;
-				setTimeout(() => {
-					this.isTouchActive = false;
-				}, 2000);
-			}
-		},
-		onContextMenu(e: MouseEvent): void {
-			if (this.node && !this.isActive) {
-				this.contextMenu.open(e, { source: 'node-right-click', nodeId: this.node.id });
-			} else {
-				e.stopPropagation();
-			}
-		},
-	},
+const contextMenu = useContextMenu((action) => {
+	if (action === 'change_color') {
+		setForceActions(true);
+		setColorPopoverVisible(true);
+	}
 });
+
+const nodeBase = useNodeBase({
+	name: props.name,
+	instance: props.instance,
+	workflowObject: props.workflow,
+	isReadOnly: props.isReadOnly,
+	emit: emit as (event: string, ...args: unknown[]) => void,
+});
+
+onClickOutside(stickOptions, () => setColorPopoverVisible(false));
+
+defineExpose({
+	deviceSupport,
+	toast,
+	contextMenu,
+	forceActions,
+	...nodeBase,
+	setForceActions,
+	isColorPopoverVisible,
+	setColorPopoverVisible,
+	stickOptions,
+});
+
+const data = computed(() => workflowsStore.getNodeByName(props.name));
+// TODO: remove either node or data
+const node = computed(() => workflowsStore.getNodeByName(props.name));
+const nodeId = computed(() => data.value?.id);
+const nodeType = computed(() => {
+	return data.value && nodeTypesStore.getNodeType(data.value.type, data.value.typeVersion);
+});
+const defaultText = computed(() => {
+	if (!nodeType.value) {
+		return '';
+	}
+	const properties = nodeType.value.properties;
+	const content = properties.find((property) => property.name === 'content');
+	return content && isString(content.default) ? content.default : '';
+});
+const isSelected = computed(
+	() =>
+		uiStore.getSelectedNodes.find(({ name }: INodeUi) => name === data.value?.name) !== undefined,
+);
+
+const position = computed<XYPosition>(() => (node.value ? node.value.position : [0, 0]));
+
+const height = computed(() =>
+	node.value && isNumber(node.value.parameters.height) ? node.value.parameters.height : 0,
+);
+
+const width = computed(() =>
+	node.value && isNumber(node.value.parameters.width) ? node.value.parameters.width : 0,
+);
+
+const stickySize = computed<StyleValue>(() => ({
+	height: height.value + 'px',
+	width: width.value + 'px',
+}));
+
+const stickyPosition = computed<StyleValue>(() => ({
+	left: position.value[0] + 'px',
+	top: position.value[1] + 'px',
+	zIndex: props.isActive ? 9999999 : -1 * Math.floor((height.value * width.value) / 1000),
+}));
+
+const workflowRunning = computed(() => uiStore.isActionActive.workflowRunning);
+
+const showActions = computed(
+	() =>
+		!(props.hideActions || props.isReadOnly || workflowRunning.value || isResizing.value) ||
+		forceActions.value,
+);
+
+onMounted(() => {
+	// Initialize the node
+	if (data.value !== null) {
+		try {
+			nodeBase.addNode(data.value);
+		} catch (error) {
+			// This breaks when new nodes are loaded into store but workflow tab is not currently active
+			// Shouldn't affect anything
+		}
+	}
+});
+
+const onShowPopover = () => setForceActions(true);
+const onHidePopover = () => setForceActions(false);
+const deleteNode = async () => {
+	assert(data.value);
+	// Wait a tick else vue causes problems because the data is gone
+	await nextTick();
+
+	emit('removeNode', data.value.name);
+};
+
+const changeColor = (index: number) => {
+	workflowsStore.updateNodeProperties({
+		name: props.name,
+		properties: {
+			parameters: {
+				...node.value?.parameters,
+				color: index,
+			},
+			position: node.value?.position ?? [0, 0],
+		},
+	});
+};
+
+const onEdit = (edit: boolean) => {
+	if (edit && !props.isActive && node.value) {
+		ndvStore.activeNodeName = node.value.name;
+	} else if (props.isActive && !edit) {
+		ndvStore.activeNodeName = null;
+	}
+};
+
+const onMarkdownClick = (link: HTMLAnchorElement) => {
+	if (link) {
+		const isOnboardingNote = props.name === QUICKSTART_NOTE_NAME;
+		const isWelcomeVideo = link.querySelector('img[alt="n8n quickstart video"]');
+		const type =
+			isOnboardingNote && isWelcomeVideo
+				? 'welcome_video'
+				: isOnboardingNote && link.getAttribute('href') === '/templates'
+					? 'templates'
+					: 'other';
+
+		telemetry.track('User clicked note link', { type });
+	}
+};
+
+const setParameters = (params: {
+	content?: string;
+	height?: number;
+	width?: number;
+	color?: string;
+}) => {
+	if (node.value) {
+		const nodeParameters = {
+			content: isString(params.content) ? params.content : node.value.parameters.content,
+			height: isNumber(params.height) ? params.height : node.value.parameters.height,
+			width: isNumber(params.width) ? params.width : node.value.parameters.width,
+			color: isString(params.color) ? params.color : node.value.parameters.color,
+		};
+
+		workflowsStore.setNodeParameters({
+			key: node.value.id,
+			name: node.value.name,
+			value: nodeParameters,
+		});
+	}
+};
+
+const onInputChange = (content: string) => {
+	if (!node.value) {
+		return;
+	}
+	node.value.parameters.content = content;
+	setParameters({ content });
+};
+
+const setPosition = (newPosition: XYPosition) => {
+	if (!node.value) return;
+
+	workflowsStore.updateNodeProperties({
+		name: node.value.name,
+		properties: { position: newPosition },
+	});
+};
+
+const onResizeStart = () => {
+	isResizing.value = true;
+	if (!isSelected.value && node.value) {
+		emit('nodeSelected', node.value.name, false, true);
+	}
+};
+
+const onResize = ({
+	height,
+	width,
+	dX,
+	dY,
+}: {
+	width: number;
+	height: number;
+	dX: number;
+	dY: number;
+}) => {
+	if (!node.value) {
+		return;
+	}
+	if (dX !== 0 || dY !== 0) {
+		setPosition([node.value.position[0] + (dX || 0), node.value.position[1] + (dY || 0)]);
+	}
+
+	setParameters({ height, width });
+};
+
+const onResizeEnd = () => {
+	isResizing.value = false;
+};
+
+const touchStart = () => {
+	if (deviceSupport.isTouchDevice && !deviceSupport.isMacOs && !isTouchActive.value) {
+		isTouchActive.value = true;
+		setTimeout(() => {
+			isTouchActive.value = false;
+		}, 2000);
+	}
+};
+
+const onContextMenu = (e: MouseEvent): void => {
+	if (node.value && !props.isActive) {
+		contextMenu.open(e, { source: 'node-right-click', nodeId: node.value.id });
+	} else {
+		e.stopPropagation();
+	}
+};
 </script>
 
 <template>
@@ -355,9 +315,9 @@ export default defineComponent({
 			<div v-show="isSelected" class="select-sticky-background" />
 			<div
 				v-touch:start="touchStart"
-				v-touch:end="touchEnd"
+				v-touch:end="nodeBase.touchEnd"
 				class="sticky-box"
-				@click.left="mouseLeftClick"
+				@click.left="nodeBase.mouseLeftClick"
 				@contextmenu="onContextMenu"
 			>
 				<N8nResizeableSticky
diff --git a/packages/editor-ui/src/components/TagsManager/AnnotationTagsManager.vue b/packages/editor-ui/src/components/TagsManager/AnnotationTagsManager.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/TagsManager/AnnotationTagsManager.vue
rename to packages/editor-ui/src/components/TagsManager/AnnotationTagsManager.ee.vue
diff --git a/packages/editor-ui/src/components/WorkerList.ee.vue b/packages/editor-ui/src/components/WorkerList.ee.vue
index 45a3d90a3b..149f0d77d7 100644
--- a/packages/editor-ui/src/components/WorkerList.ee.vue
+++ b/packages/editor-ui/src/components/WorkerList.ee.vue
@@ -10,7 +10,7 @@ import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import { useUIStore } from '@/stores/ui.store';
 import { useOrchestrationStore } from '@/stores/orchestration.store';
-import { setPageTitle } from '@/utils/htmlUtils';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import WorkerCard from './Workers/WorkerCard.ee.vue';
 import { usePushConnection } from '@/composables/usePushConnection';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
@@ -36,6 +36,7 @@ export default defineComponent({
 			i18n,
 			pushConnection,
 			...useToast(),
+			documentTitle: useDocumentTitle(),
 		};
 	},
 	computed: {
@@ -58,7 +59,7 @@ export default defineComponent({
 		},
 	},
 	mounted() {
-		setPageTitle(`n8n - ${this.pageTitle}`);
+		this.documentTitle.set(this.pageTitle);
 
 		this.$telemetry.track('User viewed worker view', {
 			instance_id: this.rootStore.instanceId,
diff --git a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
index 373ba8c21c..c8c7c222c9 100644
--- a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
@@ -63,7 +63,7 @@ onBeforeUnmount(() => {
 				:class="stale ? [$style.cardHeading, $style.stale] : [$style.cardHeading]"
 				data-test-id="worker-card-name"
 			>
-				Name: {{ worker.workerId }} ({{ worker.hostname }}) <br />
+				Name: {{ worker.senderId }} ({{ worker.hostname }}) <br />
 				Average Load: {{ averageWorkerLoadFromLoadsAsString(worker.loadAvg ?? [0]) }} | Free Memory:
 				{{ memAsGb(worker.freeMem).toFixed(2) }}GB / {{ memAsGb(worker.totalMem).toFixed(2) }}GB
 				{{ stale ? ' (stale)' : '' }}
@@ -78,7 +78,7 @@ onBeforeUnmount(() => {
 				>
 				<WorkerJobAccordion :items="worker.runningJobsSummary" />
 				<WorkerNetAccordion :items="sortedWorkerInterfaces" />
-				<WorkerChartsAccordion :worker-id="worker.workerId" />
+				<WorkerChartsAccordion :worker-id="worker.senderId" />
 			</n8n-text>
 		</div>
 		<template #append>
diff --git a/packages/editor-ui/src/components/WorkflowLMChat/WorkflowLMChat.vue b/packages/editor-ui/src/components/WorkflowLMChat/WorkflowLMChat.vue
index 9d032f5fa1..cd889278f8 100644
--- a/packages/editor-ui/src/components/WorkflowLMChat/WorkflowLMChat.vue
+++ b/packages/editor-ui/src/components/WorkflowLMChat/WorkflowLMChat.vue
@@ -384,7 +384,12 @@ function extractResponseMessage(responseData?: IDataObject) {
 
 	if (!matchedPath) return JSON.stringify(responseData, null, 2);
 
-	return get(responseData, matchedPath) as string;
+	const matchedOutput = get(responseData, matchedPath);
+	if (typeof matchedOutput === 'object') {
+		return '```json\n' + JSON.stringify(matchedOutput, null, 2) + '\n```';
+	}
+
+	return matchedOutput?.toString() ?? '';
 }
 
 async function sendMessage(message: string, files?: File[]) {
@@ -680,6 +685,9 @@ onMounted(() => {
 	[data-theme='dark'] & {
 		--chat--input--text-color: var(--input-font-color, var(--color-text-dark));
 	}
+	@media (prefers-color-scheme: dark) {
+		--chat--input--text-color: var(--input-font-color, var(--color-text-dark));
+	}
 
 	border-bottom-right-radius: var(--border-radius-base);
 	border-top-right-radius: var(--border-radius-base);
diff --git a/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts b/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts
index 0eb04df396..79bcc4b882 100644
--- a/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts
+++ b/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts
@@ -1,66 +1,111 @@
-import { createTestingPinia } from '@pinia/testing';
+import { createTestingPinia, type TestingPinia } from '@pinia/testing';
+import type { ICredentialType, INodeTypeDescription } from 'n8n-workflow';
 import { mock } from 'vitest-mock-extended';
-import type { INodeTypeDescription } from 'n8n-workflow';
 
 import CredentialIcon from '@/components/CredentialIcon.vue';
-import { STORES } from '@/constants';
-import { groupNodeTypesByNameAndType } from '@/utils/nodeTypes/nodeTypeTransforms';
 
 import { createComponentRenderer } from '@/__tests__/render';
-
-const twitterV1 = mock<INodeTypeDescription>({
-	version: 1,
-	credentials: [{ name: 'twitterOAuth1Api', required: true }],
-	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
-});
-
-const twitterV2 = mock<INodeTypeDescription>({
-	version: 2,
-	credentials: [{ name: 'twitterOAuth2Api', required: true }],
-	iconUrl: 'icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
-});
-
-const nodeTypes = groupNodeTypesByNameAndType([twitterV1, twitterV2]);
-const initialState = {
-	[STORES.CREDENTIALS]: {},
-	[STORES.NODE_TYPES]: { nodeTypes },
-};
-
-const renderComponent = createComponentRenderer(CredentialIcon, {
-	pinia: createTestingPinia({ initialState }),
-	global: {
-		stubs: ['n8n-tooltip'],
-	},
-});
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useRootStore } from '@/stores/root.store';
+import { useNodeTypesStore } from '../../stores/nodeTypes.store';
 
 describe('CredentialIcon', () => {
-	const findIcon = (baseElement: Element) => baseElement.querySelector('img');
+	const renderComponent = createComponentRenderer(CredentialIcon, {
+		pinia: createTestingPinia(),
+		global: {
+			stubs: ['n8n-tooltip'],
+		},
+	});
+	let pinia: TestingPinia;
 
-	it('shows correct icon for credential type that is for the latest node type version', () => {
-		const { baseElement } = renderComponent({
-			pinia: createTestingPinia({ initialState }),
-			props: {
-				credentialTypeName: 'twitterOAuth2Api',
-			},
-		});
-
-		expect(findIcon(baseElement)).toHaveAttribute(
-			'src',
-			'/icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
-		);
+	beforeEach(() => {
+		pinia = createTestingPinia({ stubActions: false });
 	});
 
-	it('shows correct icon for credential type that is for an older node type version', () => {
-		const { baseElement } = renderComponent({
-			pinia: createTestingPinia({ initialState }),
+	it('shows correct icon when iconUrl is set on credential', () => {
+		const testIconUrl = 'icons/n8n-nodes-base/dist/nodes/Test/test.svg';
+		useCredentialsStore().setCredentialTypes([
+			mock<ICredentialType>({
+				name: 'test',
+				iconUrl: testIconUrl,
+			}),
+		]);
+
+		const { getByRole } = renderComponent({
+			pinia,
 			props: {
-				credentialTypeName: 'twitterOAuth1Api',
+				credentialTypeName: 'test',
 			},
 		});
 
-		expect(findIcon(baseElement)).toHaveAttribute(
-			'src',
-			'/icons/n8n-nodes-base/dist/nodes/Twitter/x.svg',
-		);
+		expect(getByRole('img')).toHaveAttribute('src', useRootStore().baseUrl + testIconUrl);
+	});
+
+	it('shows correct icon when icon is set on credential', () => {
+		useCredentialsStore().setCredentialTypes([
+			mock<ICredentialType>({
+				name: 'test',
+				icon: 'fa:clock',
+				iconColor: 'azure',
+			}),
+		]);
+
+		const { getByRole } = renderComponent({
+			pinia,
+			props: {
+				credentialTypeName: 'test',
+			},
+		});
+
+		const icon = getByRole('img', { hidden: true });
+		expect(icon.tagName).toBe('svg');
+		expect(icon).toHaveClass('fa-clock');
+	});
+
+	it('shows correct icon when credential has an icon with node: prefix', () => {
+		const testIconUrl = 'icons/n8n-nodes-base/dist/nodes/Test/test.svg';
+		useCredentialsStore().setCredentialTypes([
+			mock<ICredentialType>({
+				name: 'test',
+				icon: 'node:n8n-nodes-base.test',
+				iconColor: 'azure',
+			}),
+		]);
+
+		useNodeTypesStore().setNodeTypes([
+			mock<INodeTypeDescription>({
+				version: 1,
+				name: 'n8n-nodes-base.test',
+				iconUrl: testIconUrl,
+			}),
+		]);
+
+		const { getByRole } = renderComponent({
+			pinia,
+			props: {
+				credentialTypeName: 'test',
+			},
+		});
+
+		expect(getByRole('img')).toHaveAttribute('src', useRootStore().baseUrl + testIconUrl);
+	});
+
+	it('shows fallback icon when icon is not found', () => {
+		useCredentialsStore().setCredentialTypes([
+			mock<ICredentialType>({
+				name: 'test',
+				icon: 'node:n8n-nodes-base.test',
+				iconColor: 'azure',
+			}),
+		]);
+
+		const { baseElement } = renderComponent({
+			pinia,
+			props: {
+				credentialTypeName: 'test',
+			},
+		});
+
+		expect(baseElement.querySelector('.nodeIconPlaceholder')).toBeInTheDocument();
 	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts b/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts
index e970ea9641..65caf45cc9 100644
--- a/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts
+++ b/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts
@@ -33,6 +33,7 @@ async function createPiniaWithActiveNode() {
 
 	nodeTypesStore.setNodeTypes(defaultNodeDescriptions);
 	workflowsStore.workflow = workflow;
+	workflowsStore.nodeMetadata[node.name] = { pristine: true };
 	ndvStore.activeNodeName = node.name;
 
 	await useSettingsStore().getSettings();
diff --git a/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts b/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts
index 76f8c95951..3deee4ef26 100644
--- a/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts
@@ -168,4 +168,47 @@ describe('ParameterInput.vue', () => {
 		// Nothing should be emitted
 		expect(emitted('update')).toBeUndefined();
 	});
+
+	test('should show message when can not load options without credentials', async () => {
+		mockNodeTypesState.getNodeParameterOptions = vi.fn(async () => {
+			throw new Error('Node does not have any credentials set');
+		});
+
+		// @ts-expect-error Readonly property
+		mockNodeTypesState.getNodeType = vi.fn().mockReturnValue({
+			displayName: 'Test',
+			credentials: [
+				{
+					name: 'openAiApi',
+					required: true,
+				},
+			],
+		});
+
+		const { emitted, container, getByTestId } = renderComponent(ParameterInput, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'columns',
+				parameter: {
+					displayName: 'Columns',
+					name: 'columns',
+					type: 'options',
+					typeOptions: { loadOptionsMethod: 'getColumnsMultiOptions' },
+				},
+				modelValue: 'id',
+			},
+		});
+
+		await waitFor(() => expect(getByTestId('parameter-input-field')).toBeInTheDocument());
+
+		const input = container.querySelector('input') as HTMLInputElement;
+		expect(input).toBeInTheDocument();
+
+		expect(mockNodeTypesState.getNodeParameterOptions).toHaveBeenCalled();
+
+		expect(input.value.toLowerCase()).not.toContain('error');
+		expect(input).toHaveValue('Set up credential to see options');
+
+		expect(emitted('update')).toBeUndefined();
+	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts b/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
index 5c8aedb36f..3cbe68836f 100644
--- a/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
@@ -44,13 +44,20 @@ const ifNode = createTestNode({
 	disabled: false,
 });
 
+const aiTool = createTestNode({
+	name: 'AI Tool',
+	type: '@n8n/n8n-nodes-langchain.memoryBufferWindow',
+	typeVersion: 1,
+	disabled: false,
+});
+
 async function setupStore() {
 	const workflow = mock<IWorkflowDb>({
 		id: '123',
 		name: 'Test Workflow',
 		connections: {},
 		active: true,
-		nodes: [mockNode1, mockNode2, disabledNode, ifNode],
+		nodes: [mockNode1, mockNode2, disabledNode, ifNode, aiTool],
 	});
 
 	const pinia = createPinia();
@@ -239,6 +246,49 @@ describe('RunDataSchema.vue', () => {
 		});
 	});
 
+	it('renders previous nodes schema for AI tools', async () => {
+		mockNodeOutputData(
+			'If',
+			[
+				{ id: 1, name: 'John' },
+				{ id: 2, name: 'Jane' },
+			],
+			0,
+		);
+		const { getByTestId } = renderComponent({
+			props: {
+				nodes: [
+					{
+						name: 'If',
+						indicies: [], // indicies are not set for AI tools
+						depth: 2,
+					},
+				],
+				node: aiTool,
+			},
+		});
+
+		await waitFor(() => {
+			expect(getByTestId('run-data-schema-node-name')).toHaveTextContent('If');
+			expect(getByTestId('run-data-schema-node-item-count')).toHaveTextContent('2 items');
+			expect(getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
+		});
+	});
+
+	it('renders its own data for AI tools in debug mode', async () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				nodes: [], // in debug mode nodes are empty
+				node: aiTool,
+				data: [{ output: 'AI tool output' }],
+			},
+		});
+
+		await waitFor(() => {
+			expect(getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
+		});
+	});
+
 	test.each([[[{ tx: false }, { tx: false }]], [[{ tx: '' }, { tx: '' }]], [[{ tx: [] }]]])(
 		'renders schema instead of showing no data for %o',
 		(data) => {
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
index de6c683589..9ad2012439 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
@@ -1,876 +1,296 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`RunDataSchema.vue > renders its own data for AI tools in debug mode 1`] = `
+<div
+  class="schema"
+  data-test-id="run-data-schema-node-schema"
+  data-v-46dade00=""
+>
+  <div
+    class="item"
+    data-test-id="run-data-schema-item"
+    data-v-46dade00=""
+  >
+    <div
+      class="itemContent"
+    >
+      <!--v-if-->
+      <!--v-if-->
+    </div>
+    <!--v-if-->
+    <!--v-if-->
+    <div
+      class="sub"
+    >
+      <div
+        class="innerSub"
+      >
+        
+        <div
+          class="item"
+          data-test-id="run-data-schema-item"
+        >
+          <div
+            class="itemContent"
+          >
+            <div
+              class="pill mappable"
+              title="string"
+            >
+              <span
+                class="label"
+                data-depth="1"
+                data-name="output"
+                data-path=".output"
+                data-target="mappable"
+                data-value="{{ $json.output }}"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="svg-inline--fa fa-font fa-w-14 fa-sm"
+                  data-icon="font"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  viewBox="0 0 448 512"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    class=""
+                    d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
+                    fill="currentColor"
+                  />
+                </svg>
+                <!--v-if-->
+                <span
+                  class="content"
+                >
+                  
+                  <span>
+                    <!--v-if-->
+                    output
+                  </span>
+                  
+                </span>
+              </span>
+            </div>
+            <span
+              class="text"
+              data-test-id="run-data-schema-item-value"
+            >
+              
+              
+              <!--v-if-->
+              <span
+                class="content"
+              >
+                
+                <span>
+                  <!--v-if-->
+                  AI tool output
+                </span>
+                
+              </span>
+              
+              
+            </span>
+          </div>
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+        </div>
+        
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`RunDataSchema.vue > renders previous nodes schema for AI tools 1`] = `
+<div
+  class="schema animated"
+  data-test-id="run-data-schema-node-schema"
+  data-v-46dade00=""
+>
+  <div
+    class="innerSchema"
+    data-v-46dade00=""
+  >
+    <div
+      class="item"
+      data-test-id="run-data-schema-item"
+      data-v-46dade00=""
+    >
+      <div
+        class="itemContent"
+      >
+        <!--v-if-->
+        <!--v-if-->
+      </div>
+      <!--v-if-->
+      <!--v-if-->
+      <div
+        class="sub"
+      >
+        <div
+          class="innerSub"
+        >
+          
+          <div
+            class="item"
+            data-test-id="run-data-schema-item"
+          >
+            <div
+              class="itemContent"
+            >
+              <div
+                class="pill mappable"
+                title="number"
+              >
+                <span
+                  class="label"
+                  data-depth="1"
+                  data-name="id"
+                  data-path=".id"
+                  data-target="mappable"
+                  data-value="{{ $('If').item.json.id }}"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
+                    data-icon="hashtag"
+                    data-prefix="fas"
+                    focusable="false"
+                    role="img"
+                    viewBox="0 0 448 512"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      class=""
+                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                  <!--v-if-->
+                  <span
+                    class="content"
+                  >
+                    
+                    <span>
+                      <!--v-if-->
+                      id
+                    </span>
+                    
+                  </span>
+                </span>
+              </div>
+              <span
+                class="text"
+                data-test-id="run-data-schema-item-value"
+              >
+                
+                
+                <!--v-if-->
+                <span
+                  class="content"
+                >
+                  
+                  <span>
+                    <!--v-if-->
+                    1
+                  </span>
+                  
+                </span>
+                
+                
+              </span>
+            </div>
+            <!--v-if-->
+            <!--v-if-->
+            <!--v-if-->
+          </div>
+          <div
+            class="item"
+            data-test-id="run-data-schema-item"
+          >
+            <div
+              class="itemContent"
+            >
+              <div
+                class="pill mappable"
+                title="string"
+              >
+                <span
+                  class="label"
+                  data-depth="1"
+                  data-name="name"
+                  data-path=".name"
+                  data-target="mappable"
+                  data-value="{{ $('If').item.json.name }}"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
+                    data-icon="font"
+                    data-prefix="fas"
+                    focusable="false"
+                    role="img"
+                    viewBox="0 0 448 512"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      class=""
+                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                  <!--v-if-->
+                  <span
+                    class="content"
+                  >
+                    
+                    <span>
+                      <!--v-if-->
+                      name
+                    </span>
+                    
+                  </span>
+                </span>
+              </div>
+              <span
+                class="text"
+                data-test-id="run-data-schema-item-value"
+              >
+                
+                
+                <!--v-if-->
+                <span
+                  class="content"
+                >
+                  
+                  <span>
+                    <!--v-if-->
+                    John
+                  </span>
+                  
+                </span>
+                
+                
+              </span>
+            </div>
+            <!--v-if-->
+            <!--v-if-->
+            <!--v-if-->
+          </div>
+          
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`RunDataSchema.vue > renders schema for correct output branch 1`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="age"
-                  data-path=".age"
-                  data-target="mappable"
-                  data-value="{{ $json.age }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      age
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    22
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="array"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="hobbies"
-                  data-path=".hobbies"
-                  data-target="mappable"
-                  data-value="{{ $json.hobbies }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                    data-icon="list"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      hobbies
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <!--v-if-->
-            </div>
-            <input
-              id="set_1-hobbies"
-              inert=""
-              type="checkbox"
-            />
-            <label
-              class="toggle"
-              for="set_1-hobbies"
-            >
-              <svg
-                aria-hidden="true"
-                class="svg-inline--fa fa-angle-right fa-w-8"
-                data-icon="angle-right"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                viewBox="0 0 256 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  class=""
-                  d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                  fill="currentColor"
-                />
-              </svg>
-            </label>
-            <div
-              class="sub"
-            >
-              <div
-                class="innerSub"
-              >
-                
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[0]"
-                        data-path=".hobbies[0]"
-                        data-target="mappable"
-                        data-value="{{ $json.hobbies[0] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [0]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          surfing
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[1]"
-                        data-path=".hobbies[1]"
-                        data-target="mappable"
-                        data-value="{{ $json.hobbies[1] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [1]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          traveling
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema for correct output branch 2`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="age"
-                  data-path=".age"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.age }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      age
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    22
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="array"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="hobbies"
-                  data-path=".hobbies"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.hobbies }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                    data-icon="list"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      hobbies
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <!--v-if-->
-            </div>
-            <input
-              id="set_2-hobbies"
-              inert=""
-              type="checkbox"
-            />
-            <label
-              class="toggle"
-              for="set_2-hobbies"
-            >
-              <svg
-                aria-hidden="true"
-                class="svg-inline--fa fa-angle-right fa-w-8"
-                data-icon="angle-right"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                viewBox="0 0 256 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  class=""
-                  d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                  fill="currentColor"
-                />
-              </svg>
-            </label>
-            <div
-              class="sub"
-            >
-              <div
-                class="innerSub"
-              >
-                
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[0]"
-                        data-path=".hobbies[0]"
-                        data-target="mappable"
-                        data-value="{{ $('Set2').item.json.hobbies[0] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [0]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          surfing
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[1]"
-                        data-path=".hobbies[1]"
-                        data-target="mappable"
-                        data-value="{{ $('Set2').item.json.hobbies[1] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [1]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          traveling
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema for correct output branch 3`] = `
 <div
   class="schema animated"
   data-test-id="run-data-schema-node-schema"
@@ -1281,6 +701,7 @@ exports[`RunDataSchema.vue > renders schema for data 1`] = `
               <!--v-if-->
             </div>
             <input
+              checked=""
               id="set_1-hobbies"
               inert=""
               type="checkbox"
@@ -1716,6 +1137,7 @@ exports[`RunDataSchema.vue > renders schema for data 2`] = `
               <!--v-if-->
             </div>
             <input
+              checked=""
               id="set_2-hobbies"
               inert=""
               type="checkbox"
@@ -1924,443 +1346,6 @@ exports[`RunDataSchema.vue > renders schema for data 2`] = `
 </div>
 `;
 
-exports[`RunDataSchema.vue > renders schema for in output pane 1`] = `
-<div>
-  <div
-    class="schemaWrapper"
-    data-v-46dade00=""
-  >
-    <div
-      class="schema"
-      data-test-id="run-data-schema-node-schema"
-      data-v-46dade00=""
-    >
-      <div
-        class="item"
-        data-test-id="run-data-schema-item"
-        data-v-46dade00=""
-      >
-        <div
-          class="itemContent"
-        >
-          <!--v-if-->
-          <!--v-if-->
-        </div>
-        <!--v-if-->
-        <!--v-if-->
-        <div
-          class="sub"
-        >
-          <div
-            class="innerSub"
-          >
-            
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="string"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="name"
-                    data-path=".name"
-                    data-target="mappable"
-                    data-value="{{ $json.name }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                      data-icon="font"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 448 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        name
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <span
-                  class="text"
-                  data-test-id="run-data-schema-item-value"
-                >
-                  
-                  
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      John
-                    </span>
-                    
-                  </span>
-                  
-                  
-                </span>
-              </div>
-              <!--v-if-->
-              <!--v-if-->
-              <!--v-if-->
-            </div>
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="number"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="age"
-                    data-path=".age"
-                    data-target="mappable"
-                    data-value="{{ $json.age }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                      data-icon="hashtag"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 448 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        age
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <span
-                  class="text"
-                  data-test-id="run-data-schema-item-value"
-                >
-                  
-                  
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      22
-                    </span>
-                    
-                  </span>
-                  
-                  
-                </span>
-              </div>
-              <!--v-if-->
-              <!--v-if-->
-              <!--v-if-->
-            </div>
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="array"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="hobbies"
-                    data-path=".hobbies"
-                    data-target="mappable"
-                    data-value="{{ $json.hobbies }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                      data-icon="list"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 512 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        hobbies
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <!--v-if-->
-              </div>
-              <input
-                id="output_object-0-0-hobbies"
-                inert=""
-                type="checkbox"
-              />
-              <label
-                class="toggle"
-                for="output_object-0-0-hobbies"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="svg-inline--fa fa-angle-right fa-w-8"
-                  data-icon="angle-right"
-                  data-prefix="fas"
-                  focusable="false"
-                  role="img"
-                  viewBox="0 0 256 512"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    class=""
-                    d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                    fill="currentColor"
-                  />
-                </svg>
-              </label>
-              <div
-                class="sub"
-              >
-                <div
-                  class="innerSub"
-                >
-                  
-                  <div
-                    class="item"
-                    data-test-id="run-data-schema-item"
-                  >
-                    <div
-                      class="itemContent"
-                    >
-                      <div
-                        class="pill mappable"
-                        title="string"
-                      >
-                        <span
-                          class="label"
-                          data-depth="2"
-                          data-name="string[0]"
-                          data-path=".hobbies[0]"
-                          data-target="mappable"
-                          data-value="{{ $json.hobbies[0] }}"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                            data-icon="font"
-                            data-prefix="fas"
-                            focusable="false"
-                            role="img"
-                            viewBox="0 0 448 512"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              class=""
-                              d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                              fill="currentColor"
-                            />
-                          </svg>
-                          <span
-                            class="content"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              hobbies
-                            </span>
-                            
-                          </span>
-                          <span
-                            class="content arrayIndex"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              [0]
-                            </span>
-                            
-                          </span>
-                        </span>
-                      </div>
-                      <span
-                        class="text"
-                        data-test-id="run-data-schema-item-value"
-                      >
-                        
-                        
-                        <!--v-if-->
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            surfing
-                          </span>
-                          
-                        </span>
-                        
-                        
-                      </span>
-                    </div>
-                    <!--v-if-->
-                    <!--v-if-->
-                    <!--v-if-->
-                  </div>
-                  <div
-                    class="item"
-                    data-test-id="run-data-schema-item"
-                  >
-                    <div
-                      class="itemContent"
-                    >
-                      <div
-                        class="pill mappable"
-                        title="string"
-                      >
-                        <span
-                          class="label"
-                          data-depth="2"
-                          data-name="string[1]"
-                          data-path=".hobbies[1]"
-                          data-target="mappable"
-                          data-value="{{ $json.hobbies[1] }}"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                            data-icon="font"
-                            data-prefix="fas"
-                            focusable="false"
-                            role="img"
-                            viewBox="0 0 448 512"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              class=""
-                              d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                              fill="currentColor"
-                            />
-                          </svg>
-                          <span
-                            class="content"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              hobbies
-                            </span>
-                            
-                          </span>
-                          <span
-                            class="content arrayIndex"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              [1]
-                            </span>
-                            
-                          </span>
-                        </span>
-                      </div>
-                      <span
-                        class="text"
-                        data-test-id="run-data-schema-item-value"
-                      >
-                        
-                        
-                        <!--v-if-->
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            traveling
-                          </span>
-                          
-                        </span>
-                        
-                        
-                      </span>
-                    </div>
-                    <!--v-if-->
-                    <!--v-if-->
-                    <!--v-if-->
-                  </div>
-                  
-                </div>
-              </div>
-            </div>
-            
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
 exports[`RunDataSchema.vue > renders schema in output pane 1`] = `
 <div>
   <div
@@ -2589,6 +1574,7 @@ exports[`RunDataSchema.vue > renders schema in output pane 1`] = `
                 <!--v-if-->
               </div>
               <input
+                checked=""
                 id="output_object-0-0-hobbies"
                 inert=""
                 type="checkbox"
@@ -2980,6 +1966,7 @@ exports[`RunDataSchema.vue > renders schema with spaces and dots 1`] = `
                         <!--v-if-->
                       </div>
                       <input
+                        checked=""
                         id="set_1-hello world"
                         inert=""
                         type="checkbox"
@@ -3072,6 +2059,7 @@ exports[`RunDataSchema.vue > renders schema with spaces and dots 1`] = `
                               <!--v-if-->
                             </div>
                             <input
+                              checked=""
                               id="set_1-hello world-0"
                               inert=""
                               type="checkbox"
@@ -3155,6 +2143,7 @@ exports[`RunDataSchema.vue > renders schema with spaces and dots 1`] = `
                                     <!--v-if-->
                                   </div>
                                   <input
+                                    checked=""
                                     id="set_1-hello world-0-test"
                                     inert=""
                                     type="checkbox"
diff --git a/packages/editor-ui/src/components/canvas/Canvas.spec.ts b/packages/editor-ui/src/components/canvas/Canvas.spec.ts
index 8768e97798..5ab4c6e96e 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.spec.ts
+++ b/packages/editor-ui/src/components/canvas/Canvas.spec.ts
@@ -87,6 +87,8 @@ describe('Canvas', () => {
 	});
 
 	it('should handle `update:nodes:position` event', async () => {
+		vi.useFakeTimers();
+
 		const nodes = [createCanvasNodeElement()];
 		const { container, emitted } = renderComponent({
 			props: {
@@ -110,22 +112,9 @@ describe('Canvas', () => {
 		});
 		await fireEvent.mouseUp(node, { view: window });
 
+		vi.advanceTimersByTime(250); // Event debounce time
+
 		expect(emitted()['update:nodes:position']).toEqual([
-			[
-				[
-					{
-						id: '1',
-						type: 'position',
-						dragging: true,
-						from: {
-							x: 100,
-							y: 100,
-							z: 0,
-						},
-						position: { x: 80, y: 80 },
-					},
-				],
-			],
 			[
 				[
 					{
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index a552c5bd23..64a9e5647a 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -18,7 +18,7 @@ import { Background } from '@vue-flow/background';
 import { MiniMap } from '@vue-flow/minimap';
 import Node from './elements/nodes/CanvasNode.vue';
 import Edge from './elements/edges/CanvasEdge.vue';
-import { computed, onMounted, onUnmounted, provide, ref, useCssModule, watch } from 'vue';
+import { computed, onMounted, onUnmounted, provide, ref, toRef, useCssModule, watch } from 'vue';
 import type { EventBus } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system';
 import { useContextMenu, type ContextMenuAction } from '@/composables/useContextMenu';
@@ -29,7 +29,7 @@ import type { PinDataSource } from '@/composables/usePinnedData';
 import { isPresent } from '@/utils/typesUtils';
 import { GRID_SIZE } from '@/utils/nodeViewUtils';
 import { CanvasKey } from '@/constants';
-import { onKeyDown, onKeyUp } from '@vueuse/core';
+import { onKeyDown, onKeyUp, useDebounceFn } from '@vueuse/core';
 import CanvasArrowHeadMarker from './elements/edges/CanvasArrowHeadMarker.vue';
 
 const $style = useCssModule();
@@ -78,6 +78,7 @@ const props = withDefaults(
 		controlsPosition?: PanelPosition;
 		eventBus?: EventBus<CanvasEventBusEvents>;
 		readOnly?: boolean;
+		executing?: boolean;
 		keyBindings?: boolean;
 	}>(),
 	{
@@ -87,6 +88,7 @@ const props = withDefaults(
 		controlsPosition: PanelPosition.BottomLeft,
 		eventBus: () => createEventBus(),
 		readOnly: false,
+		executing: false,
 		keyBindings: true,
 	},
 );
@@ -136,30 +138,34 @@ onKeyUp(panningKeyCode, () => {
 	isPanningEnabled.value = false;
 });
 
-useKeybindings(
-	{
-		ctrl_c: emitWithSelectedNodes((ids) => emit('copy:nodes', ids)),
-		ctrl_x: emitWithSelectedNodes((ids) => emit('cut:nodes', ids)),
-		'delete|backspace': emitWithSelectedNodes((ids) => emit('delete:nodes', ids)),
-		ctrl_d: emitWithSelectedNodes((ids) => emit('duplicate:nodes', ids)),
-		d: emitWithSelectedNodes((ids) => emit('update:nodes:enabled', ids)),
-		p: emitWithSelectedNodes((ids) => emit('update:nodes:pin', ids, 'keyboard-shortcut')),
-		enter: emitWithLastSelectedNode((id) => onSetNodeActive(id)),
-		f2: emitWithLastSelectedNode((id) => emit('update:node:name', id)),
-		tab: () => emit('create:node', 'tab'),
-		shift_s: () => emit('create:sticky'),
-		ctrl_alt_n: () => emit('create:workflow'),
-		ctrl_enter: () => emit('run:workflow'),
-		ctrl_s: () => emit('save:workflow'),
-		ctrl_a: () => addSelectedNodes(graphNodes.value),
-		'+|=': async () => await onZoomIn(),
-		'-|_': async () => await onZoomOut(),
-		0: async () => await onResetZoom(),
-		1: async () => await onFitView(),
-		// @TODO implement arrow key shortcuts to modify selection
-	},
-	{ disabled: disableKeyBindings },
-);
+const keyMap = computed(() => ({
+	ctrl_c: emitWithSelectedNodes((ids) => emit('copy:nodes', ids)),
+	enter: emitWithLastSelectedNode((id) => onSetNodeActive(id)),
+	ctrl_a: () => addSelectedNodes(graphNodes.value),
+	'+|=': async () => await onZoomIn(),
+	'-|_': async () => await onZoomOut(),
+	0: async () => await onResetZoom(),
+	1: async () => await onFitView(),
+	// @TODO implement arrow key shortcuts to modify selection
+
+	...(props.readOnly
+		? {}
+		: {
+				ctrl_x: emitWithSelectedNodes((ids) => emit('cut:nodes', ids)),
+				'delete|backspace': emitWithSelectedNodes((ids) => emit('delete:nodes', ids)),
+				ctrl_d: emitWithSelectedNodes((ids) => emit('duplicate:nodes', ids)),
+				d: emitWithSelectedNodes((ids) => emit('update:nodes:enabled', ids)),
+				p: emitWithSelectedNodes((ids) => emit('update:nodes:pin', ids, 'keyboard-shortcut')),
+				f2: emitWithLastSelectedNode((id) => emit('update:node:name', id)),
+				tab: () => emit('create:node', 'tab'),
+				shift_s: () => emit('create:sticky'),
+				ctrl_alt_n: () => emit('create:workflow'),
+				ctrl_enter: () => emit('run:workflow'),
+				ctrl_s: () => emit('save:workflow'),
+			}),
+}));
+
+useKeybindings(keyMap, { disabled: disableKeyBindings });
 
 /**
  * Nodes
@@ -174,21 +180,22 @@ function onClickNodeAdd(id: string, handle: string) {
 	emit('click:node:add', id, handle);
 }
 
-function onUpdateNodesPosition(events: NodePositionChange[]) {
+// Debounced to prevent emitting too many events, necessary for undo/redo
+const onUpdateNodesPosition = useDebounceFn((events: NodePositionChange[]) => {
 	emit('update:nodes:position', events);
-}
+}, 200);
 
 function onUpdateNodePosition(id: string, position: XYPosition) {
 	emit('update:node:position', id, position);
 }
 
-function onNodesChange(events: NodeChange[]) {
-	const isPositionChangeEvent = (event: NodeChange): event is NodePositionChange =>
-		event.type === 'position' && 'position' in event;
+const isPositionChangeEvent = (event: NodeChange): event is NodePositionChange =>
+	event.type === 'position' && 'position' in event;
 
+function onNodesChange(events: NodeChange[]) {
 	const positionChangeEndEvents = events.filter(isPositionChangeEvent);
 	if (positionChangeEndEvents.length > 0) {
-		onUpdateNodesPosition(positionChangeEndEvents);
+		void onUpdateNodesPosition(positionChangeEndEvents);
 	}
 }
 
@@ -480,8 +487,11 @@ watch(() => props.readOnly, setReadonly, {
  * Provide
  */
 
+const isExecuting = toRef(props, 'executing');
+
 provide(CanvasKey, {
 	connectingHandle,
+	isExecuting,
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
index 1604d3bc98..319084c1f2 100644
--- a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
+++ b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
@@ -21,6 +21,7 @@ const props = withDefaults(
 		fallbackNodes?: IWorkflowDb['nodes'];
 		eventBus?: EventBus<CanvasEventBusEvents>;
 		readOnly?: boolean;
+		executing?: boolean;
 	}>(),
 	{
 		id: 'canvas',
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.spec.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.spec.ts
index 7591a86668..812dd7effc 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.spec.ts
@@ -50,7 +50,7 @@ describe('CanvasConnectionLine', () => {
 
 		expect(edge).toHaveAttribute(
 			'd',
-			'M0 0L 32,0Q 40,0 40,8L 40,132Q 40,140 32,140L1 140L0 140M0 140L-40 140L -132,140Q -140,140 -140,132L -140,-92Q -140,-100 -132,-100L-100 -100',
+			'M0 0L 24,0Q 40,0 40,16L 40,124Q 40,140 24,140L1 140L0 140M0 140L-40 140L -124,140Q -140,140 -140,124L -140,-84Q -140,-100 -124,-100L-100 -100',
 		);
 	});
 
@@ -71,7 +71,7 @@ describe('CanvasConnectionLine', () => {
 
 		expect(edge).toHaveAttribute(
 			'd',
-			'M-72 -290L -57,-290Q -52,-290 -52,-285L -52,-165Q -52,-160 -57,-160L -359,-160Q -364,-160 -364,-155L -364,-35Q -364,-30 -359,-30L-344 -30',
+			'M-72 -290L -62,-290Q -52,-290 -52,-280L -52,-176Q -52,-160 -68,-160L -348,-160Q -364,-160 -364,-144L -364,-40Q -364,-30 -354,-30L-344 -30',
 		);
 	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
index 86b1a5971d..8cb47fab93 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
@@ -4,16 +4,35 @@ import type { ConnectionLineProps } from '@vue-flow/core';
 import { BaseEdge } from '@vue-flow/core';
 import { computed, useCssModule } from 'vue';
 import { getCustomPath } from './utils/edgePath';
+import { useCanvas } from '@/composables/useCanvas';
+import { NodeConnectionType } from 'n8n-workflow';
+import { parseCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
 
 const props = defineProps<ConnectionLineProps>();
 
 const $style = useCssModule();
 
+const { connectingHandle } = useCanvas();
+
+const connectionType = computed(
+	() => parseCanvasConnectionHandleString(connectingHandle.value?.handleId).type,
+);
+
+const edgeColor = computed(() => {
+	if (connectionType.value !== NodeConnectionType.Main) {
+		return 'var(--node-type-supplemental-color)';
+	} else {
+		return 'var(--color-foreground-xdark)';
+	}
+});
+
 const edgeStyle = computed(() => ({
+	...(connectionType.value === NodeConnectionType.Main ? {} : { strokeDasharray: '8,8' }),
 	strokeWidth: 2,
+	stroke: edgeColor.value,
 }));
 
-const path = computed(() => getCustomPath(props));
+const path = computed(() => getCustomPath(props, { connectionType: connectionType.value }));
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.spec.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.spec.ts
index 93ca4f13fd..6a8ce9e789 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.spec.ts
@@ -124,7 +124,31 @@ describe('CanvasEdge', () => {
 
 		expect(edge).toHaveAttribute(
 			'd',
-			'M0 0L 32,0Q 40,0 40,8L 40,132Q 40,140 32,140L1 140L0 140M0 140L-40 140L -132,140Q -140,140 -140,132L -140,-92Q -140,-100 -132,-100L-100 -100',
+			'M0 0L 24,0Q 40,0 40,16L 40,124Q 40,140 24,140L1 140L0 140M0 140L-40 140L -124,140Q -140,140 -140,124L -140,-84Q -140,-100 -124,-100L-100 -100',
 		);
 	});
+
+	it('should render a correct bezier path when the connection is backwards and node connection type is non-main', () => {
+		const { container } = renderComponent({
+			props: {
+				...DEFAULT_PROPS,
+				data: {
+					...DEFAULT_PROPS.data,
+					source: {
+						type: NodeConnectionType.AiTool,
+					},
+				},
+				sourceX: 0,
+				sourceY: 0,
+				sourcePosition: Position.Right,
+				targetX: -100,
+				targetY: -100,
+				targetPosition: Position.Left,
+			},
+		});
+
+		const edge = container.querySelector('.vue-flow__edge-path');
+
+		expect(edge).toHaveAttribute('d', 'M0,0 C62.5,0 -162.5,-100 -100,-100');
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
index cb384489a9..44887754c0 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
@@ -5,7 +5,7 @@ import { isValidNodeConnectionType } from '@/utils/typeGuards';
 import type { Connection, EdgeProps } from '@vue-flow/core';
 import { useVueFlow, BaseEdge, EdgeLabelRenderer } from '@vue-flow/core';
 import { NodeConnectionType } from 'n8n-workflow';
-import { computed, useCssModule, ref } from 'vue';
+import { computed, useCssModule, ref, toRef } from 'vue';
 import CanvasEdgeToolbar from './CanvasEdgeToolbar.vue';
 import { getCustomPath } from './utils/edgePath';
 
@@ -21,6 +21,8 @@ export type CanvasEdgeProps = EdgeProps<CanvasConnectionData> & {
 
 const props = defineProps<CanvasEdgeProps>();
 
+const data = toRef(props, 'data');
+
 const { onEdgeMouseEnter, onEdgeMouseLeave } = useVueFlow();
 
 const isHovered = ref(false);
@@ -42,18 +44,23 @@ const connectionType = computed(() =>
 		: NodeConnectionType.Main,
 );
 
-const renderToolbar = computed(() => (props.selected || isHovered.value) && !props.readOnly);
+const renderToolbar = computed(() => isHovered.value && !props.readOnly);
+
+const isMainConnection = computed(() => data.value.source.type === NodeConnectionType.Main);
 
 const status = computed(() => props.data.status);
-const statusColor = computed(() => {
-	if (props.selected) {
-		return 'var(--color-background-dark)';
-	} else if (status.value === 'success') {
+
+const edgeColor = computed(() => {
+	if (status.value === 'success') {
 		return 'var(--color-success)';
 	} else if (status.value === 'pinned') {
 		return 'var(--color-secondary)';
 	} else if (status.value === 'running') {
 		return 'var(--color-primary)';
+	} else if (!isMainConnection.value) {
+		return 'var(--node-type-supplemental-color)';
+	} else if (props.selected) {
+		return 'var(--color-background-dark)';
 	} else {
 		return 'var(--color-foreground-xdark)';
 	}
@@ -61,11 +68,12 @@ const statusColor = computed(() => {
 
 const edgeStyle = computed(() => ({
 	...props.style,
+	...(isMainConnection.value ? {} : { strokeDasharray: '8,8' }),
 	strokeWidth: 2,
-	stroke: isHovered.value ? 'var(--color-primary)' : statusColor.value,
+	stroke: isHovered.value ? 'var(--color-primary)' : edgeColor.value,
 }));
 
-const edgeLabelStyle = computed(() => ({ color: statusColor.value }));
+const edgeLabelStyle = computed(() => ({ color: edgeColor.value }));
 
 const edgeToolbarStyle = computed(() => {
 	const [, labelX, labelY] = path.value;
@@ -74,7 +82,11 @@ const edgeToolbarStyle = computed(() => {
 	};
 });
 
-const path = computed(() => getCustomPath(props));
+const path = computed(() =>
+	getCustomPath(props, {
+		connectionType: connectionType.value,
+	}),
+);
 
 const connection = computed<Connection>(() => ({
 	source: props.source,
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/utils/edgePath.ts b/packages/editor-ui/src/components/canvas/elements/edges/utils/edgePath.ts
index 8975641a1a..053fda35a1 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/utils/edgePath.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/utils/edgePath.ts
@@ -1,38 +1,43 @@
 import type { EdgeProps } from '@vue-flow/core';
 import { getBezierPath, getSmoothStepPath, Position } from '@vue-flow/core';
+import { NodeConnectionType } from 'n8n-workflow';
 
-const EDGE_PADDING_Y = 140;
-const EDGE_PADDING_Y_TOP = 80;
-const EDGE_BORDER_RADIUS = 8;
-const EDGE_OFFSET = 40;
-// const HANDLE_SIZE = 16;
+const EDGE_PADDING_TOP = 80;
+const EDGE_PADDING_BOTTOM = 140;
+const EDGE_PADDING_X = 40;
+const EDGE_BORDER_RADIUS = 16;
+const HANDLE_SIZE = 20; // Required to avoid connection line glitching when initially interacting with the handle
 
-const isTargetHandlePositionedLeftOfSourceTarget = (sourceX: number, targetX: number) =>
-	sourceX > targetX;
+const isRightOfSourceHandle = (sourceX: number, targetX: number) => sourceX - HANDLE_SIZE > targetX;
 
 const pathIntersectsNodes = (targetY: number, sourceY: number) =>
-	Math.abs(targetY - sourceY) < EDGE_PADDING_Y;
+	Math.abs(targetY - sourceY) < EDGE_PADDING_BOTTOM;
 
 export function getCustomPath(
 	props: Pick<
 		EdgeProps,
 		'sourceX' | 'sourceY' | 'sourcePosition' | 'targetX' | 'targetY' | 'targetPosition'
 	>,
+	{
+		connectionType = NodeConnectionType.Main,
+	}: {
+		connectionType?: NodeConnectionType;
+	} = {},
 ) {
 	const { targetX, targetY, sourceX, sourceY, sourcePosition, targetPosition } = props;
 	const yDiff = targetY - sourceY;
 
-	if (!isTargetHandlePositionedLeftOfSourceTarget(sourceX, targetX)) {
+	if (!isRightOfSourceHandle(sourceX, targetX) || connectionType !== NodeConnectionType.Main) {
 		return getBezierPath(props);
 	}
 
 	// Connection is backwards and the source is on the right side
 	// -> We need to avoid overlapping the source node
 	if (pathIntersectsNodes(targetY, sourceY)) {
-		const direction = yDiff < -EDGE_PADDING_Y || yDiff > 0 ? 'up' : 'down';
+		const direction = yDiff < -EDGE_PADDING_BOTTOM || yDiff > 0 ? 'up' : 'down';
 		const firstSegmentTargetX = sourceX;
 		const firstSegmentTargetY =
-			sourceY + (direction === 'up' ? -EDGE_PADDING_Y_TOP : EDGE_PADDING_Y);
+			sourceY + (direction === 'up' ? -EDGE_PADDING_TOP : EDGE_PADDING_BOTTOM);
 		const [firstSegmentPath] = getSmoothStepPath({
 			sourceX,
 			sourceY,
@@ -41,7 +46,7 @@ export function getCustomPath(
 			sourcePosition,
 			targetPosition: Position.Right,
 			borderRadius: EDGE_BORDER_RADIUS,
-			offset: EDGE_OFFSET,
+			offset: EDGE_PADDING_X,
 		});
 		const path = getSmoothStepPath({
 			sourceX: firstSegmentTargetX,
@@ -51,12 +56,15 @@ export function getCustomPath(
 			sourcePosition: Position.Left,
 			targetPosition,
 			borderRadius: EDGE_BORDER_RADIUS,
-			offset: EDGE_OFFSET,
+			offset: EDGE_PADDING_X,
 		});
 
 		path[0] = firstSegmentPath + path[0];
 		return path;
 	}
 
-	return getSmoothStepPath(props);
+	return getSmoothStepPath({
+		...props,
+		borderRadius: EDGE_BORDER_RADIUS,
+	});
 }
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue b/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue
index 9b28d855ed..1f312c7136 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue
@@ -11,21 +11,25 @@ import CanvasHandleMainOutput from '@/components/canvas/elements/handles/render-
 import CanvasHandleNonMainInput from '@/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue';
 import CanvasHandleNonMainOutput from '@/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue';
 import { CanvasNodeHandleKey } from '@/constants';
-import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
 import { useCanvasNode } from '@/composables/useCanvasNode';
 
-const props = defineProps<{
-	mode: CanvasConnectionMode;
-	isConnected?: boolean;
-	isConnecting?: boolean;
-	isReadOnly?: boolean;
-	label?: string;
-	type: CanvasConnectionPort['type'];
-	index: CanvasConnectionPort['index'];
-	position: CanvasElementPortWithRenderData['position'];
-	offset: CanvasElementPortWithRenderData['offset'];
-	isValidConnection: ValidConnectionFunc;
-}>();
+const props = defineProps<
+	CanvasElementPortWithRenderData & {
+		type: CanvasConnectionPort['type'];
+		required?: CanvasConnectionPort['required'];
+		maxConnections?: CanvasConnectionPort['maxConnections'];
+		index: CanvasConnectionPort['index'];
+		label?: CanvasConnectionPort['label'];
+		handleId: CanvasElementPortWithRenderData['handleId'];
+		connectionsCount: CanvasElementPortWithRenderData['connectionsCount'];
+		isConnecting: CanvasElementPortWithRenderData['isConnecting'];
+		position: CanvasElementPortWithRenderData['position'];
+		offset?: CanvasElementPortWithRenderData['offset'];
+		mode: CanvasConnectionMode;
+		isReadOnly?: boolean;
+		isValidConnection: ValidConnectionFunc;
+	}
+>();
 
 const emit = defineEmits<{
 	add: [handle: string];
@@ -41,23 +45,29 @@ const handleType = computed(() =>
 	props.mode === CanvasConnectionMode.Input ? 'target' : 'source',
 );
 
-const handleString = computed(() =>
-	createCanvasConnectionHandleString({
-		mode: props.mode,
-		type: props.type,
-		index: props.index,
-	}),
-);
+const handleClasses = computed(() => [style.handle, style[props.type], style[props.mode]]);
+
+/**
+ * Connectable
+ */
+
+const connectionsLimitReached = computed(() => {
+	return props.maxConnections && props.connectionsCount >= props.maxConnections;
+});
 
 const isConnectableStart = computed(() => {
+	if (connectionsLimitReached.value) return false;
+
 	return props.mode === CanvasConnectionMode.Output || props.type !== NodeConnectionType.Main;
 });
 
 const isConnectableEnd = computed(() => {
+	if (connectionsLimitReached.value) return false;
+
 	return props.mode === CanvasConnectionMode.Input || props.type !== NodeConnectionType.Main;
 });
 
-const handleClasses = computed(() => [style.handle, style[props.type], style[props.mode]]);
+const isConnected = computed(() => props.connectionsCount > 0);
 
 /**
  * Run data
@@ -102,7 +112,7 @@ const RenderType = () => {
  */
 
 function onAdd() {
-	emit('add', handleString.value);
+	emit('add', props.handleId);
 }
 
 /**
@@ -110,12 +120,12 @@ function onAdd() {
  */
 
 const label = toRef(props, 'label');
-const isConnected = toRef(props, 'isConnected');
 const isConnecting = toRef(props, 'isConnecting');
 const isReadOnly = toRef(props, 'isReadOnly');
 const mode = toRef(props, 'mode');
 const type = toRef(props, 'type');
 const index = toRef(props, 'index');
+const isRequired = toRef(props, 'required');
 
 provide(CanvasNodeHandleKey, {
 	label,
@@ -123,6 +133,7 @@ provide(CanvasNodeHandleKey, {
 	type,
 	index,
 	runData,
+	isRequired,
 	isConnected,
 	isConnecting,
 	isReadOnly,
@@ -132,7 +143,7 @@ provide(CanvasNodeHandleKey, {
 <template>
 	<Handle
 		v-bind="$attrs"
-		:id="handleString"
+		:id="handleId"
 		:class="handleClasses"
 		:type="handleType"
 		:position="position"
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue
index 27abce02a8..fc9f847f76 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue
@@ -1,12 +1,21 @@
 <script lang="ts" setup>
 import { useCanvasNodeHandle } from '@/composables/useCanvasNodeHandle';
+import { computed, useCssModule } from 'vue';
 
-const { label } = useCanvasNodeHandle();
+const $style = useCssModule();
+
+const { label, isRequired } = useCanvasNodeHandle();
+
+const classes = computed(() => ({
+	'canvas-node-handle-main-input': true,
+	[$style.handle]: true,
+	[$style.required]: isRequired.value,
+}));
 
 const handleClasses = 'target';
 </script>
 <template>
-	<div :class="['canvas-node-handle-main-input', $style.handle]">
+	<div :class="classes">
 		<div :class="[$style.label]">{{ label }}</div>
 		<CanvasHandleRectangle :handle-classes="handleClasses" />
 	</div>
@@ -32,4 +41,9 @@ const handleClasses = 'target';
 	text-align: center;
 	white-space: nowrap;
 }
+
+.required .label::after {
+	content: '*';
+	color: var(--color-danger);
+}
 </style>
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.spec.ts
index 6027bda5cd..944c790633 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.spec.ts
@@ -32,6 +32,23 @@ describe('CanvasHandleMainOutput', () => {
 		expect(queryByTestId('canvas-handle-plus')).not.toBeInTheDocument();
 	});
 
+	it('should render CanvasHandlePlus with success state when runData.total > 1', () => {
+		const { queryByTestId } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasHandleProvide({
+						runData: {
+							total: 2,
+							iterations: 1,
+						},
+					}),
+				},
+			},
+		});
+
+		expect(queryByTestId('canvas-handle-plus')).toHaveClass('success');
+	});
+
 	it('should render run data label', async () => {
 		const runData = {
 			total: 1,
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
index 11fa0da31f..b2d97fdd52 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useCanvasNodeHandle } from '@/composables/useCanvasNodeHandle';
 import { useCanvasNode } from '@/composables/useCanvasNode';
-import { computed, ref } from 'vue';
+import { computed, ref, useCssModule } from 'vue';
 import type { CanvasNodeDefaultRender } from '@/types';
 import { useI18n } from '@/composables/useI18n';
 
@@ -9,15 +9,26 @@ const emit = defineEmits<{
 	add: [];
 }>();
 
+const $style = useCssModule();
+
 const i18n = useI18n();
 const { render } = useCanvasNode();
-const { label, isConnected, isConnecting, isReadOnly, runData } = useCanvasNodeHandle();
+const { label, isConnected, isConnecting, isReadOnly, isRequired, runData } = useCanvasNodeHandle();
 
 const handleClasses = 'source';
+
+const classes = computed(() => ({
+	'canvas-node-handle-main-output': true,
+	[$style.handle]: true,
+	[$style.required]: isRequired.value,
+}));
+
 const isHovered = ref(false);
 
 const renderOptions = computed(() => render.value.options as CanvasNodeDefaultRender['options']);
 
+const runDataTotal = computed(() => runData.value?.total ?? 0);
+
 const runDataLabel = computed(() =>
 	runData.value
 		? i18n.baseText('ndv.output.items', {
@@ -29,7 +40,7 @@ const runDataLabel = computed(() =>
 
 const isHandlePlusVisible = computed(() => !isConnecting.value || isHovered.value);
 
-const plusState = computed(() => (runData.value ? 'success' : 'default'));
+const plusType = computed(() => (runDataTotal.value > 0 ? 'success' : 'default'));
 
 const plusLineSize = computed(
 	() =>
@@ -37,7 +48,7 @@ const plusLineSize = computed(
 			small: 46,
 			medium: 66,
 			large: 80,
-		})[(renderOptions.value.outputs?.labelSize ?? runData.value) ? 'large' : 'small'],
+		})[(runDataTotal.value > 0 ? 'large' : renderOptions.value.outputs?.labelSize) ?? 'small'],
 );
 
 function onMouseEnter() {
@@ -53,7 +64,7 @@ function onClickAdd() {
 }
 </script>
 <template>
-	<div :class="['canvas-node-handle-main-output', $style.handle]">
+	<div :class="classes">
 		<div v-if="label" :class="[$style.label, $style.outputLabel]">{{ label }}</div>
 		<div v-else-if="runData" :class="[$style.label, $style.runDataLabel]">{{ runDataLabel }}</div>
 		<CanvasHandleDot :handle-classes="handleClasses" />
@@ -64,7 +75,7 @@ function onClickAdd() {
 				data-test-id="canvas-handle-plus"
 				:line-size="plusLineSize"
 				:handle-classes="handleClasses"
-				:state="plusState"
+				:type="plusType"
 				@mouseenter="onMouseEnter"
 				@mouseleave="onMouseLeave"
 				@click:plus="onClickAdd"
@@ -91,6 +102,11 @@ function onClickAdd() {
 	overflow: hidden;
 }
 
+.required .label::after {
+	content: '*';
+	color: var(--color-danger);
+}
+
 .outputLabel {
 	top: 50%;
 	left: var(--spacing-m);
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue
index c9c24ab427..bd03ffdd9e 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue
@@ -2,24 +2,34 @@
 import CanvasHandlePlus from '@/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue';
 import { useCanvasNodeHandle } from '@/composables/useCanvasNodeHandle';
 import { NodeConnectionType } from 'n8n-workflow';
-import { computed, ref } from 'vue';
+import { computed, ref, useCssModule } from 'vue';
 
 const emit = defineEmits<{
 	add: [];
 }>();
 
-const { label, isConnected, isConnecting, type } = useCanvasNodeHandle();
+const $style = useCssModule();
+
+const { label, isConnected, isConnecting, isRequired, type } = useCanvasNodeHandle();
 
 const handleClasses = 'target';
 
+const classes = computed(() => ({
+	'canvas-node-handle-non-main-input': true,
+	[$style.handle]: true,
+	[$style.required]: isRequired.value,
+}));
+
 const supportsMultipleConnections = computed(() => type.value === NodeConnectionType.AiTool);
 
 const isHandlePlusAvailable = computed(
 	() => !isConnected.value || supportsMultipleConnections.value,
 );
+
 const isHandlePlusVisible = computed(
 	() => !isConnecting.value || isHovered.value || supportsMultipleConnections.value,
 );
+
 const isHovered = ref(false);
 
 function onMouseEnter() {
@@ -35,7 +45,7 @@ function onClickAdd() {
 }
 </script>
 <template>
-	<div :class="['canvas-node-handle-non-main-input', $style.handle]">
+	<div :class="classes">
 		<div :class="[$style.label]">{{ label }}</div>
 		<CanvasHandleDiamond :handle-classes="handleClasses" />
 		<Transition name="canvas-node-handle-non-main-input">
@@ -43,6 +53,7 @@ function onClickAdd() {
 				v-if="isHandlePlusAvailable"
 				v-show="isHandlePlusVisible"
 				:handle-classes="handleClasses"
+				type="secondary"
 				position="bottom"
 				@mouseenter="onMouseEnter"
 				@mouseleave="onMouseLeave"
@@ -66,12 +77,17 @@ function onClickAdd() {
 	left: 50%;
 	transform: translate(-50%, 0);
 	font-size: var(--font-size-2xs);
-	color: var(--color-foreground-xdark);
+	color: var(--node-type-supplemental-color);
 	background: var(--color-canvas-label-background);
 	z-index: 1;
 	text-align: center;
 	white-space: nowrap;
 }
+
+.required .label::after {
+	content: '*';
+	color: var(--color-danger);
+}
 </style>
 
 <style lang="scss">
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue
index 028f2dff09..fe4bc31192 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue
@@ -1,13 +1,21 @@
 <script lang="ts" setup>
 import { useCanvasNodeHandle } from '@/composables/useCanvasNodeHandle';
+import { computed, useCssModule } from 'vue';
 
-const { label } = useCanvasNodeHandle();
+const $style = useCssModule();
+const { label, isRequired } = useCanvasNodeHandle();
 
 const handleClasses = 'source';
+
+const classes = computed(() => ({
+	'canvas-node-handle-non-main-output': true,
+	[$style.handle]: true,
+	[$style.required]: isRequired.value,
+}));
 </script>
 <template>
-	<div :class="['canvas-node-handle-non-main-output', $style.handle]">
-		<div :class="[$style.label]">{{ label }}</div>
+	<div :class="classes">
+		<div :class="$style.label">{{ label }}</div>
 		<CanvasHandleDiamond :handle-classes="handleClasses" />
 	</div>
 </template>
@@ -23,15 +31,20 @@ const handleClasses = 'source';
 .label {
 	position: absolute;
 	top: -20px;
-	left: -50%;
-	transform: translate(0%, 0);
+	left: 50%;
+	transform: translate(-50%, 0);
 	font-size: var(--font-size-2xs);
-	color: var(--color-foreground-xdark);
+	color: var(--node-type-supplemental-color);
 	background: var(--color-canvas-label-background);
 	z-index: 0;
 	white-space: nowrap;
 }
 
+.required .label::after {
+	content: '*';
+	color: var(--color-danger);
+}
+
 :global(.vue-flow__handle:not(.connectionindicator)) .plus {
 	display: none;
 	position: absolute;
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.spec.ts
index 9f030f4519..157875d81b 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.spec.ts
@@ -40,9 +40,9 @@ describe('CanvasHandlePlus', () => {
 		});
 	});
 
-	it('should apply correct classes based on state', () => {
+	it('should apply correct classes based on status', () => {
 		const { container } = renderComponent({
-			props: { state: 'success' },
+			props: { type: 'success' },
 		});
 
 		expect(container.firstChild).toHaveClass('success');
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
index 87e47cb6ac..9afc8105c9 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
@@ -7,14 +7,14 @@ const props = withDefaults(
 		handleClasses?: string;
 		plusSize?: number;
 		lineSize?: number;
-		state?: 'success' | 'default';
+		type?: 'success' | 'secondary' | 'default';
 	}>(),
 	{
 		position: 'right',
 		handleClasses: undefined,
 		plusSize: 24,
 		lineSize: 46,
-		state: 'default',
+		type: 'default',
 	},
 );
 
@@ -27,7 +27,7 @@ const style = useCssModule();
 const classes = computed(() => [
 	style.wrapper,
 	style[props.position],
-	style[props.state],
+	style[props.type],
 	props.handleClasses,
 ]);
 
@@ -135,8 +135,26 @@ function onClick(event: MouseEvent) {
 .wrapper {
 	position: relative;
 
-	&.success .line {
-		stroke: var(--color-success);
+	&.secondary {
+		.line {
+			stroke: var(--node-type-supplemental-color);
+		}
+
+		.plus {
+			path {
+				fill: var(--node-type-supplemental-color);
+			}
+
+			rect {
+				stroke: var(--node-type-supplemental-color);
+			}
+		}
+	}
+
+	&.success {
+		.line {
+			stroke: var(--color-success);
+		}
 	}
 }
 
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index df1eebf332..6bb648e0b3 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -154,7 +154,7 @@ const createEndpointMappingFn =
 			index: endpoint.index,
 		});
 		const handleType = mode === CanvasConnectionMode.Input ? 'target' : 'source';
-		const isConnected = !!connections.value[mode][endpoint.type]?.[endpoint.index]?.length;
+		const connectionsCount = connections.value[mode][endpoint.type]?.[endpoint.index]?.length ?? 0;
 		const isConnecting =
 			connectingHandle.value?.nodeId === props.id &&
 			connectingHandle.value?.handleType === handleType &&
@@ -163,7 +163,7 @@ const createEndpointMappingFn =
 		return {
 			...endpoint,
 			handleId,
-			isConnected,
+			connectionsCount,
 			isConnecting,
 			position,
 			offset: {
@@ -260,36 +260,30 @@ onBeforeUnmount(() => {
 		:class="[$style.canvasNode, { [$style.showToolbar]: showToolbar }]"
 		data-test-id="canvas-node"
 	>
-		<template v-for="source in mappedOutputs" :key="source.handleId">
+		<template
+			v-for="source in mappedOutputs"
+			:key="`${source.handleId}(${source.index + 1}/${mappedOutputs.length})`"
+		>
 			<CanvasHandleRenderer
-				data-test-id="canvas-node-output-handle"
+				v-bind="source"
 				:mode="CanvasConnectionMode.Output"
-				:type="source.type"
-				:label="source.label"
-				:index="source.index"
-				:position="source.position"
-				:offset="source.offset"
-				:is-connected="source.isConnected"
-				:is-connecting="source.isConnecting"
 				:is-read-only="readOnly"
 				:is-valid-connection="isValidConnection"
+				data-test-id="canvas-node-output-handle"
 				@add="onAdd"
 			/>
 		</template>
 
-		<template v-for="target in mappedInputs" :key="target.handleId">
+		<template
+			v-for="target in mappedInputs"
+			:key="`${target.handleId}(${target.index + 1}/${mappedInputs.length})`"
+		>
 			<CanvasHandleRenderer
-				data-test-id="canvas-node-input-handle"
+				v-bind="target"
 				:mode="CanvasConnectionMode.Input"
-				:type="target.type"
-				:label="target.label"
-				:index="target.index"
-				:position="target.position"
-				:offset="target.offset"
-				:is-connected="target.isConnected"
-				:is-connecting="target.isConnecting"
 				:is-read-only="readOnly"
 				:is-valid-connection="isValidConnection"
+				data-test-id="canvas-node-input-handle"
 				@add="onAdd"
 			/>
 		</template>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.spec.ts
index 8f079a7bac..619457e903 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.spec.ts
@@ -1,7 +1,7 @@
 import { fireEvent } from '@testing-library/vue';
 import CanvasNodeToolbar from '@/components/canvas/elements/nodes/CanvasNodeToolbar.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasNodeProvide } from '@/__tests__/data';
+import { createCanvasNodeProvide, createCanvasProvide } from '@/__tests__/data';
 import { CanvasNodeRenderType } from '@/types';
 
 const renderComponent = createComponentRenderer(CanvasNodeToolbar);
@@ -12,6 +12,7 @@ describe('CanvasNodeToolbar', () => {
 			global: {
 				provide: {
 					...createCanvasNodeProvide(),
+					...createCanvasProvide(),
 				},
 			},
 		});
@@ -19,6 +20,21 @@ describe('CanvasNodeToolbar', () => {
 		expect(getByTestId('execute-node-button')).toBeInTheDocument();
 	});
 
+	it('should render disabled execute node button when canvas is executing', () => {
+		const { getByTestId } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide(),
+					...createCanvasProvide({
+						isExecuting: true,
+					}),
+				},
+			},
+		});
+
+		expect(getByTestId('execute-node-button')).toBeDisabled();
+	});
+
 	it('should not render execute node button when renderType is configuration', async () => {
 		const { queryByTestId } = renderComponent({
 			global: {
@@ -31,6 +47,7 @@ describe('CanvasNodeToolbar', () => {
 							},
 						},
 					}),
+					...createCanvasProvide(),
 				},
 			},
 		});
@@ -43,6 +60,7 @@ describe('CanvasNodeToolbar', () => {
 			global: {
 				provide: {
 					...createCanvasNodeProvide(),
+					...createCanvasProvide(),
 				},
 			},
 		});
@@ -57,6 +75,7 @@ describe('CanvasNodeToolbar', () => {
 			global: {
 				provide: {
 					...createCanvasNodeProvide(),
+					...createCanvasProvide(),
 				},
 			},
 		});
@@ -71,6 +90,7 @@ describe('CanvasNodeToolbar', () => {
 			global: {
 				provide: {
 					...createCanvasNodeProvide(),
+					...createCanvasProvide(),
 				},
 			},
 		});
@@ -85,6 +105,7 @@ describe('CanvasNodeToolbar', () => {
 			global: {
 				provide: {
 					...createCanvasNodeProvide(),
+					...createCanvasProvide(),
 				},
 			},
 		});
@@ -106,6 +127,7 @@ describe('CanvasNodeToolbar', () => {
 							},
 						},
 					}),
+					...createCanvasProvide(),
 				},
 			},
 		});
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
index b22401f5a6..52639d49dc 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
@@ -3,6 +3,7 @@ import { computed, useCssModule } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { useCanvasNode } from '@/composables/useCanvasNode';
 import { CanvasNodeRenderType } from '@/types';
+import { useCanvas } from '@/composables/useCanvas';
 
 const emit = defineEmits<{
 	delete: [];
@@ -19,13 +20,12 @@ const props = defineProps<{
 const $style = useCssModule();
 const i18n = useI18n();
 
-const { render } = useCanvasNode();
+const { isExecuting } = useCanvas();
+const { isDisabled, render } = useCanvasNode();
 
-// @TODO
-const workflowRunning = false;
-
-// @TODO
-const nodeDisabledTitle = 'Test';
+const nodeDisabledTitle = computed(() => {
+	return isDisabled.value ? i18n.baseText('node.disable') : i18n.baseText('node.enable');
+});
 
 const classes = computed(() => ({
 	[$style.canvasNodeToolbar]: true,
@@ -84,7 +84,7 @@ function onOpenContextMenu(event: MouseEvent) {
 				text
 				size="small"
 				icon="play"
-				:disabled="workflowRunning"
+				:disabled="isExecuting"
 				:title="i18n.baseText('node.testStep')"
 				@click="executeNode"
 			/>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.spec.ts
index 6ba17c31e7..422168c2ab 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.spec.ts
@@ -190,6 +190,19 @@ describe('CanvasNodeDefault', () => {
 		});
 	});
 
+	describe('waiting', () => {
+		it('should apply waiting class when node is waiting', () => {
+			const { getByText } = renderComponent({
+				global: {
+					provide: {
+						...createCanvasNodeProvide({ data: { execution: { running: true, waiting: '123' } } }),
+					},
+				},
+			});
+			expect(getByText('Test Node').closest('.node')).toHaveClass('waiting');
+		});
+	});
+
 	describe('running', () => {
 		it('should apply running class when node is running', () => {
 			const { getByText } = renderComponent({
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index 7a7f16f017..74bce00cfd 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -25,6 +25,8 @@ const {
 	isDisabled,
 	isSelected,
 	hasPinnedData,
+	executionStatus,
+	executionWaiting,
 	executionRunning,
 	hasRunData,
 	hasIssues,
@@ -53,6 +55,7 @@ const classes = computed(() => {
 		[$style.success]: hasRunData.value,
 		[$style.error]: hasIssues.value,
 		[$style.pinned]: hasPinnedData.value,
+		[$style.waiting]: executionWaiting.value ?? executionStatus.value === 'waiting',
 		[$style.running]: executionRunning.value,
 		[$style.configurable]: renderOptions.value.configurable,
 		[$style.configuration]: renderOptions.value.configuration,
@@ -118,12 +121,14 @@ function openContextMenu(event: MouseEvent) {
 				<FontAwesomeIcon icon="bolt" size="lg" />
 			</div>
 		</N8nTooltip>
-		<CanvasNodeStatusIcons :class="$style.statusIcons" />
+		<CanvasNodeStatusIcons v-if="!isDisabled" :class="$style.statusIcons" />
 		<CanvasNodeDisabledStrikeThrough v-if="isStrikethroughVisible" />
 		<div :class="$style.description">
 			<div v-if="label" :class="$style.label">
 				{{ label }}
-				<div v-if="isDisabled">({{ i18n.baseText('node.disabled') }})</div>
+			</div>
+			<div v-if="isDisabled" :class="$style.disabledLabel">
+				({{ i18n.baseText('node.disabled') }})
 			</div>
 			<div v-if="subtitle" :class="$style.subtitle">{{ subtitle }}</div>
 		</div>
@@ -190,6 +195,7 @@ function openContextMenu(event: MouseEvent) {
 		.description {
 			top: unset;
 			position: relative;
+			margin-top: 0;
 			margin-left: var(--spacing-s);
 			width: auto;
 			min-width: unset;
@@ -199,6 +205,19 @@ function openContextMenu(event: MouseEvent) {
 					) - 2 * var(--spacing-s)
 			);
 		}
+
+		.label {
+			text-align: left;
+		}
+
+		&.configuration {
+			--canvas-node--height: 75px;
+
+			.statusIcons {
+				right: calc(-1 * var(--spacing-2xs));
+				bottom: 0;
+			}
+		}
 	}
 
 	/**
@@ -230,6 +249,10 @@ function openContextMenu(event: MouseEvent) {
 		background-color: var(--color-node-executing-background);
 		border-color: var(--color-canvas-node-running-border-color, var(--color-node-running-border));
 	}
+
+	&.waiting {
+		border-color: var(--color-canvas-node-waiting-border-color, var(--color-secondary));
+	}
 }
 
 .description {
@@ -244,7 +267,8 @@ function openContextMenu(event: MouseEvent) {
 	align-items: center;
 }
 
-.label {
+.label,
+.disabledLabel {
 	font-size: var(--font-size-m);
 	text-align: center;
 	text-overflow: ellipsis;
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
index c03c5473bc..6a0d0ac8ec 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
@@ -27,6 +27,7 @@ const renderOptions = computed(() => render.value.options as CanvasNodeStickyNot
 const classes = computed(() => ({
 	[$style.sticky]: true,
 	[$style.selected]: isSelected.value,
+	['sticky--active']: isActive.value, // Used to increase the z-index of the sticky note when editing
 }));
 
 /**
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.spec.ts.snap
index 386a3c5982..0f4170b92e 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.spec.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.spec.ts.snap
@@ -17,9 +17,9 @@ exports[`CanvasNodeDefault > configurable > should render configurable node corr
     <div
       class="label"
     >
-      Test Node 
-      <!--v-if-->
+      Test Node
     </div>
+    <!--v-if-->
     <div
       class="subtitle"
     >
@@ -46,9 +46,9 @@ exports[`CanvasNodeDefault > configuration > should render configurable configur
     <div
       class="label"
     >
-      Test Node 
-      <!--v-if-->
+      Test Node
     </div>
+    <!--v-if-->
     <div
       class="subtitle"
     >
@@ -75,9 +75,9 @@ exports[`CanvasNodeDefault > configuration > should render configuration node co
     <div
       class="label"
     >
-      Test Node 
-      <!--v-if-->
+      Test Node
     </div>
+    <!--v-if-->
     <div
       class="subtitle"
     >
@@ -104,9 +104,9 @@ exports[`CanvasNodeDefault > should render node correctly 1`] = `
     <div
       class="label"
     >
-      Test Node 
-      <!--v-if-->
+      Test Node
     </div>
+    <!--v-if-->
     <div
       class="subtitle"
     >
@@ -156,9 +156,9 @@ exports[`CanvasNodeDefault > trigger > should render trigger node correctly 1`]
     <div
       class="label"
     >
-      Test Node 
-      <!--v-if-->
+      Test Node
     </div>
+    <!--v-if-->
     <div
       class="subtitle"
     >
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
index f006d10311..d292e8f951 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
@@ -1,18 +1,15 @@
 <script setup lang="ts">
 import { computed, useCssModule } from 'vue';
+import { useCanvasNode } from '@/composables/useCanvasNode';
 
 const $style = useCssModule();
 
-const isSuccessStatus = computed(
-	() => false,
-	// @TODO Implement this
-	// () => !['unknown'].includes(node.status) && workflowDataItems > 0,
-);
+const { hasRunData } = useCanvasNode();
 
 const classes = computed(() => {
 	return {
 		[$style.disabledStrikeThrough]: true,
-		[$style.success]: isSuccessStatus.value,
+		[$style.success]: hasRunData.value,
 	};
 });
 </script>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
index 71d9250205..b3413183dd 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
@@ -34,16 +34,18 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
 			<FontAwesomeIcon icon="exclamation-triangle" />
 		</N8nTooltip>
 	</div>
-	<div
-		v-else-if="executionWaiting || executionStatus === 'waiting'"
-		:class="[$style.status, $style.waiting]"
-	>
-		<N8nTooltip placement="bottom">
-			<template #content>
-				<div v-text="executionWaiting"></div>
-			</template>
-			<FontAwesomeIcon icon="clock" />
-		</N8nTooltip>
+	<div v-else-if="executionWaiting || executionStatus === 'waiting'">
+		<div :class="[$style.status, $style.waiting]">
+			<N8nTooltip placement="bottom">
+				<template #content>
+					<div v-text="executionWaiting"></div>
+				</template>
+				<FontAwesomeIcon icon="clock" />
+			</N8nTooltip>
+		</div>
+		<div :class="[$style.status, $style['node-waiting-spinner']]">
+			<FontAwesomeIcon icon="sync-alt" spin />
+		</div>
 	</div>
 	<div
 		v-else-if="hasPinnedData && !nodeHelpers.isProductionExecutionPreview.value && !isDisabled"
@@ -84,6 +86,10 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
 	color: var(--color-success);
 }
 
+.waiting {
+	color: var(--color-secondary);
+}
+
 .pinnedData {
 	color: var(--color-secondary);
 }
@@ -97,6 +103,18 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
 	font-size: 3.75em;
 	color: hsla(var(--color-primary-h), var(--color-primary-s), var(--color-primary-l), 0.7);
 }
+.node-waiting-spinner {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 3.75em;
+	color: hsla(var(--color-primary-h), var(--color-primary-s), var(--color-primary-l), 0.7);
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	left: -34px;
+	top: -34px;
+}
 
 .issues {
 	color: var(--color-danger);
diff --git a/packages/editor-ui/src/components/executions/ExecutionsFilter.vue b/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
index f4ac47c595..b76b51f24d 100644
--- a/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
+++ b/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
@@ -8,14 +8,13 @@ import type {
 } from '@/Interface';
 import { i18n as locale } from '@/plugins/i18n';
 import { getObjectKeys, isEmpty } from '@/utils/typesUtils';
-import { EnterpriseEditionFeature, EXECUTION_ANNOTATION_EXPERIMENT } from '@/constants';
+import { EnterpriseEditionFeature } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
-import { usePostHog } from '@/stores/posthog.store';
 import { useTelemetry } from '@/composables/useTelemetry';
 import type { Placement } from '@floating-ui/core';
 import { useDebounce } from '@/composables/useDebounce';
-import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.vue';
+import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.ee.vue';
 
 export type ExecutionFilterProps = {
 	workflows?: Array<IWorkflowDb | IWorkflowShortResponse>;
@@ -27,7 +26,6 @@ const DATE_TIME_MASK = 'YYYY-MM-DD HH:mm';
 
 const settingsStore = useSettingsStore();
 const uiStore = useUIStore();
-const posthogStore = usePostHog();
 const { debounce } = useDebounce();
 
 const telemetry = useTelemetry();
@@ -48,11 +46,7 @@ const isCustomDataFilterTracked = ref(false);
 const isAdvancedExecutionFilterEnabled = computed(
 	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
 );
-const isAnnotationFiltersEnabled = computed(
-	() =>
-		isAdvancedExecutionFilterEnabled.value &&
-		posthogStore.isFeatureEnabled(EXECUTION_ANNOTATION_EXPERIMENT),
-);
+const isAnnotationFiltersEnabled = computed(() => isAdvancedExecutionFilterEnabled.value);
 const showTags = computed(() => false);
 
 const getDefaultFilter = (): ExecutionFilterType => ({
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
index f526867d51..4673d420ad 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
@@ -2,11 +2,7 @@
 import { watch, computed, ref, onMounted } from 'vue';
 import ExecutionsFilter from '@/components/executions/ExecutionsFilter.vue';
 import GlobalExecutionsListItem from '@/components/executions/global/GlobalExecutionsListItem.vue';
-import {
-	EnterpriseEditionFeature,
-	EXECUTION_ANNOTATION_EXPERIMENT,
-	MODAL_CONFIRM,
-} from '@/constants';
+import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
 import { useToast } from '@/composables/useToast';
 import { useMessage } from '@/composables/useMessage';
 import { useI18n } from '@/composables/useI18n';
@@ -17,7 +13,6 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useExecutionsStore } from '@/stores/executions.store';
 import type { PermissionsRecord } from '@/permissions';
 import { getResourcePermissions } from '@/permissions';
-import { usePostHog } from '@/stores/posthog.store';
 import { useSettingsStore } from '@/stores/settings.store';
 
 const props = withDefaults(
@@ -42,7 +37,6 @@ const i18n = useI18n();
 const telemetry = useTelemetry();
 const workflowsStore = useWorkflowsStore();
 const executionsStore = useExecutionsStore();
-const posthogStore = usePostHog();
 const settingsStore = useSettingsStore();
 
 const isMounted = ref(false);
@@ -72,9 +66,7 @@ const workflows = computed<IWorkflowDb[]>(() => {
 });
 
 const isAnnotationEnabled = computed(
-	() =>
-		settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters] &&
-		posthogStore.isFeatureEnabled(EXECUTION_ANNOTATION_EXPERIMENT),
+	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
 );
 
 watch(
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
index 43d85e8e27..f23dbbc4ac 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
@@ -62,7 +62,9 @@ const classes = computed(() => {
 });
 
 const formattedStartedAtDate = computed(() => {
-	return props.execution.startedAt ? formatDate(props.execution.startedAt) : '';
+	return props.execution.startedAt
+		? formatDate(props.execution.startedAt)
+		: i18n.baseText('executionsList.startingSoon');
 });
 
 const formattedWaitTillDate = computed(() => {
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
similarity index 99%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.vue
rename to packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
index 437cfd8e12..424c38aad8 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
@@ -2,7 +2,7 @@
 import { ref, computed } from 'vue';
 import type { AnnotationVote, ExecutionSummary } from 'n8n-workflow';
 import { useExecutionsStore } from '@/stores/executions.store';
-import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.vue';
+import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.ee.vue';
 import { createEventBus } from 'n8n-design-system';
 import VoteButtons from '@/components/executions/workflow/VoteButtons.vue';
 import { useToast } from '@/composables/useToast';
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 e1a34eaef6..b9b9645b0a 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
@@ -150,4 +150,25 @@ describe('WorkflowExecutionsCard', () => {
 			}
 		},
 	);
+
+	test('displays correct text for new execution', () => {
+		const createdAt = new Date('2024-09-27T12:00:00Z');
+		const props = {
+			execution: {
+				id: '1',
+				mode: 'manual',
+				status: 'new',
+				createdAt: createdAt.toISOString(),
+			},
+			workflowPermissions: {
+				execute: true,
+			},
+		};
+
+		const { getByTestId } = renderComponent({ props });
+
+		const executionTimeElement = getByTestId('execution-time');
+		expect(executionTimeElement).toBeVisible();
+		expect(executionTimeElement.textContent).toBe('27 Sep - Starting soon');
+	});
 });
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
index 5c74cc2594..ff6631ab21 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
@@ -2,15 +2,15 @@
 import { computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
-import { EnterpriseEditionFeature, EXECUTION_ANNOTATION_EXPERIMENT, VIEWS } from '@/constants';
+import { EnterpriseEditionFeature, 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';
-import { usePostHog } from '@/stores/posthog.store';
 import { useSettingsStore } from '@/stores/settings.store';
+import { toDayMonth, toTime } from '@/utils/formatters/dateFormatter';
 
 const props = defineProps<{
 	execution: ExecutionSummary;
@@ -29,17 +29,12 @@ const locale = useI18n();
 
 const executionHelpers = useExecutionHelpers();
 const workflowsStore = useWorkflowsStore();
-const posthogStore = usePostHog();
 const settingsStore = useSettingsStore();
 
 const isAdvancedExecutionFilterEnabled = computed(
 	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
 );
-const isAnnotationEnabled = computed(
-	() =>
-		isAdvancedExecutionFilterEnabled.value &&
-		posthogStore.isFeatureEnabled(EXECUTION_ANNOTATION_EXPERIMENT),
-);
+const isAnnotationEnabled = computed(() => isAdvancedExecutionFilterEnabled.value);
 
 const currentWorkflow = computed(() => (route.params.name as string) || workflowsStore.workflowId);
 const retryExecutionActions = computed(() => [
@@ -87,7 +82,17 @@ function onRetryMenuItemSelect(action: string): void {
 			:data-test-execution-status="executionUIDetails.name"
 		>
 			<div :class="$style.description">
-				<N8nText color="text-dark" :bold="true" size="medium" data-test-id="execution-time">
+				<N8nText
+					v-if="executionUIDetails.name === 'new'"
+					color="text-dark"
+					:bold="true"
+					size="medium"
+					data-test-id="execution-time"
+				>
+					{{ toDayMonth(executionUIDetails.createdAt) }} -
+					{{ locale.baseText('executionDetails.startingSoon') }}
+				</N8nText>
+				<N8nText v-else color="text-dark" :bold="true" size="medium" data-test-id="execution-time">
 					{{ executionUIDetails.startTime }}
 				</N8nText>
 				<div :class="$style.executionStatus">
@@ -106,6 +111,15 @@ function onRetryMenuItemSelect(action: string): void {
 						{{ locale.baseText('executionDetails.runningTimeRunning') }}
 						<ExecutionsTime :start-time="execution.startedAt" />
 					</N8nText>
+					<N8nText
+						v-if="executionUIDetails.name === 'new' && execution.createdAt"
+						:color="isActive ? 'text-dark' : 'text-base'"
+						size="small"
+					>
+						<span
+							>{{ locale.baseText('executionDetails.at') }} {{ toTime(execution.createdAt) }}</span
+						>
+					</N8nText>
 					<N8nText
 						v-else-if="executionUIDetails.runningTime !== ''"
 						:color="isActive ? 'text-dark' : 'text-base'"
@@ -216,10 +230,10 @@ function onRetryMenuItemSelect(action: string): void {
 	&.new {
 		&,
 		& .executionLink {
-			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-new);
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-waiting);
 		}
 		.statusLabel {
-			color: var(--color-text-dark);
+			color: var(--execution-card-text-waiting);
 		}
 	}
 
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
index 9f06b080f0..afd8f96e13 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
@@ -4,20 +4,15 @@ import { useRoute } from 'vue-router';
 import { ElDropdown } from 'element-plus';
 import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
 import { useMessage } from '@/composables/useMessage';
+import WorkflowExecutionAnnotationPanel from '@/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue';
 import WorkflowPreview from '@/components/WorkflowPreview.vue';
-import {
-	EnterpriseEditionFeature,
-	EXECUTION_ANNOTATION_EXPERIMENT,
-	MODAL_CONFIRM,
-	VIEWS,
-} from '@/constants';
+import { EnterpriseEditionFeature, 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';
-import { usePostHog } from '@/stores/posthog.store';
 import { useSettingsStore } from '@/stores/settings.store';
 
 type RetryDropdownRef = InstanceType<typeof ElDropdown>;
@@ -39,7 +34,6 @@ const executionHelpers = useExecutionHelpers();
 const message = useMessage();
 const executionDebugging = useExecutionDebugging();
 const workflowsStore = useWorkflowsStore();
-const posthogStore = usePostHog();
 const settingsStore = useSettingsStore();
 
 const retryDropdownRef = ref<RetryDropdownRef | null>(null);
@@ -67,9 +61,7 @@ const isRetriable = computed(
 );
 
 const isAnnotationEnabled = computed(
-	() =>
-		settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters] &&
-		posthogStore.isFeatureEnabled(EXECUTION_ANNOTATION_EXPERIMENT),
+	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
 );
 
 const hasAnnotation = computed(
diff --git a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
index d5bd8cc82e..470d0b5fd4 100644
--- a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
+++ b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
@@ -63,10 +63,11 @@ export default defineComponent({
 		},
 	},
 	async beforeMount() {
-		await this.projectsStore.getAllProjects();
+		await this.projectsStore.getAvailableProjects();
 		this.selectedProject =
-			this.projectsStore.projects.find((project) => project.id === this.modelValue.homeProject) ??
-			null;
+			this.projectsStore.availableProjects.find(
+				(project) => project.id === this.modelValue.homeProject,
+			) ?? null;
 	},
 	methods: {
 		setKeyValue(key: string, value: unknown) {
@@ -126,7 +127,7 @@ export default defineComponent({
 				/>
 				<ProjectSharing
 					v-model="selectedProject"
-					:projects="projectsStore.projects"
+					:projects="projectsStore.availableProjects"
 					:placeholder="$locale.baseText('forms.resourceFiltersDropdown.owner.placeholder')"
 					:empty-options-text="$locale.baseText('projects.sharing.noMatchingProjects')"
 					@update:model-value="setKeyValue('homeProject', ($event as ProjectSharingData).id)"
diff --git a/packages/editor-ui/src/utils/__tests__/nodeTypesUtils.spec.ts b/packages/editor-ui/src/composables/__tests__/useAIAssistantHelpers.test.ts
similarity index 95%
rename from packages/editor-ui/src/utils/__tests__/nodeTypesUtils.spec.ts
rename to packages/editor-ui/src/composables/__tests__/useAIAssistantHelpers.test.ts
index 118095ed24..d04733336e 100644
--- a/packages/editor-ui/src/utils/__tests__/nodeTypesUtils.spec.ts
+++ b/packages/editor-ui/src/composables/__tests__/useAIAssistantHelpers.test.ts
@@ -1,6 +1,8 @@
 import { describe, it, expect } from 'vitest';
-import { getReferencedNodes } from '../nodeTypesUtils';
 import type { INode } from 'n8n-workflow';
+import { useAIAssistantHelpers } from '../useAIAssistantHelpers';
+import { createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
 
 const referencedNodesTestCases: Array<{ caseName: string; node: INode; expected: string[] }> = [
 	{
@@ -376,8 +378,15 @@ const referencedNodesTestCases: Array<{ caseName: string; node: INode; expected:
 ];
 
 describe.each(referencedNodesTestCases)('getReferencedNodes', (testCase) => {
+	let aiAssistantHelpers: ReturnType<typeof useAIAssistantHelpers>;
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+		aiAssistantHelpers = useAIAssistantHelpers();
+	});
+
 	const caseName = testCase.caseName;
 	it(`${caseName}`, () => {
-		expect(getReferencedNodes(testCase.node)).toEqual(testCase.expected);
+		expect(aiAssistantHelpers.getReferencedNodes(testCase.node)).toEqual(testCase.expected);
 	});
 });
diff --git a/packages/editor-ui/src/composables/__tests__/useCanvasOperations.spec.ts b/packages/editor-ui/src/composables/__tests__/useCanvasOperations.spec.ts
index c8cff33828..e4ece8768f 100644
--- a/packages/editor-ui/src/composables/__tests__/useCanvasOperations.spec.ts
+++ b/packages/editor-ui/src/composables/__tests__/useCanvasOperations.spec.ts
@@ -22,7 +22,7 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { waitFor } from '@testing-library/vue';
 import { createTestingPinia } from '@pinia/testing';
 import { mockedStore } from '@/__tests__/utils';
-import { SET_NODE_TYPE, STORES } from '@/constants';
+import { SET_NODE_TYPE, STICKY_NODE_TYPE, STORES } from '@/constants';
 import type { Connection } from '@vue-flow/core';
 import { useClipboard } from '@/composables/useClipboard';
 
@@ -81,10 +81,11 @@ describe('useCanvasOperations', () => {
 		},
 	};
 
-	beforeEach(async () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+
 		const pinia = createTestingPinia({ initialState });
 		setActivePinia(pinia);
-		vi.clearAllMocks();
 	});
 
 	describe('requireNodeTypeDescription', () => {
@@ -251,6 +252,24 @@ describe('useCanvasOperations', () => {
 
 			await waitFor(() => expect(ndvStore.setActiveNodeName).toHaveBeenCalledWith('Test Name'));
 		});
+
+		it('should not set sticky node type as active node', async () => {
+			const ndvStore = useNDVStore();
+			const nodeTypeDescription = mockNodeTypeDescription({ name: STICKY_NODE_TYPE });
+
+			const { addNode } = useCanvasOperations({ router });
+			addNode(
+				{
+					type: STICKY_NODE_TYPE,
+					typeVersion: 1,
+					name: 'Test Name',
+				},
+				nodeTypeDescription,
+				{ openNDV: true },
+			);
+
+			await waitFor(() => expect(ndvStore.setActiveNodeName).not.toHaveBeenCalled());
+		});
 	});
 
 	describe('resolveNodePosition', () => {
@@ -278,7 +297,7 @@ describe('useCanvasOperations', () => {
 			const position = resolveNodePosition({ ...node, position: undefined }, nodeTypeDescription);
 
 			expect(position).toEqual([200, 160]);
-			expect(uiStore.lastCancelledConnectionPosition).toBeNull();
+			expect(uiStore.lastCancelledConnectionPosition).toBeUndefined();
 		});
 
 		it('should place the node to the right of the last interacted with node', () => {
@@ -323,10 +342,12 @@ describe('useCanvasOperations', () => {
 				createTestWorkflowObject(workflowsStore.workflow),
 			);
 
-			vi.spyOn(NodeHelpers, 'getNodeOutputs').mockReturnValue([
+			vi.spyOn(NodeHelpers, 'getNodeOutputs').mockReturnValueOnce([
 				{ type: NodeConnectionType.AiTool },
 			]);
-			vi.spyOn(NodeHelpers, 'getConnectionTypes').mockReturnValue([NodeConnectionType.AiTool]);
+			vi.spyOn(NodeHelpers, 'getConnectionTypes')
+				.mockReturnValueOnce([NodeConnectionType.AiTool])
+				.mockReturnValueOnce([NodeConnectionType.AiTool]);
 
 			const { resolveNodePosition } = useCanvasOperations({ router });
 			const position = resolveNodePosition({ ...node, position: undefined }, nodeTypeDescription);
@@ -1072,32 +1093,48 @@ describe('useCanvasOperations', () => {
 	});
 
 	describe('isConnectionAllowed', () => {
-		it('should return false if source and target nodes are the same', () => {
-			const node = mockNode({ id: '1', type: 'testType', name: 'Test Node' });
-			const { isConnectionAllowed } = useCanvasOperations({ router });
-			expect(isConnectionAllowed(node, node, NodeConnectionType.Main)).toBe(false);
-		});
-
 		it('should return false if target node type does not have inputs', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
 			const nodeTypesStore = mockedStore(useNodeTypesStore);
 			const sourceNode = mockNode({
 				id: '1',
 				type: 'sourceType',
 				name: 'Source Node',
 			});
+			const sourceNodeTypeDescription = mockNodeTypeDescription({
+				name: sourceNode.type,
+				outputs: [],
+			});
 			const targetNode = mockNode({
 				id: '2',
 				type: 'targetType',
 				name: 'Target Node',
 			});
-			const nodeTypeDescription = mockNodeTypeDescription({
-				name: 'targetType',
+			const targetNodeTypeDescription = mockNodeTypeDescription({
+				name: targetNode.type,
 				inputs: [],
 			});
-			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			nodeTypesStore.getNodeType = vi.fn(
+				(nodeTypeName: string) =>
+					({
+						[sourceNode.type]: sourceNodeTypeDescription,
+						[targetNode.type]: targetNodeTypeDescription,
+					})[nodeTypeName],
+			);
 
 			const { isConnectionAllowed } = useCanvasOperations({ router });
-			expect(isConnectionAllowed(sourceNode, targetNode, NodeConnectionType.Main)).toBe(false);
+			expect(
+				isConnectionAllowed(
+					sourceNode,
+					targetNode,
+					NodeConnectionType.Main,
+					NodeConnectionType.Main,
+				),
+			).toBe(false);
 		});
 
 		it('should return false if target node does not exist in the workflow', () => {
@@ -1109,25 +1146,42 @@ describe('useCanvasOperations', () => {
 				type: 'sourceType',
 				name: 'Source Node',
 			});
+			const sourceNodeTypeDescription = mockNodeTypeDescription({
+				name: sourceNode.type,
+				outputs: [],
+			});
 			const targetNode = mockNode({
 				id: '2',
 				type: 'targetType',
 				name: 'Target Node',
 			});
-			const nodeTypeDescription = mockNodeTypeDescription({
-				name: 'targetType',
+			const targetNodeTypeDescription = mockNodeTypeDescription({
+				name: targetNode.type,
 				inputs: [NodeConnectionType.Main],
 			});
 
 			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
 			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
-			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+			nodeTypesStore.getNodeType = vi.fn(
+				(nodeTypeName: string) =>
+					({
+						[sourceNode.type]: sourceNodeTypeDescription,
+						[targetNode.type]: targetNodeTypeDescription,
+					})[nodeTypeName],
+			);
 
 			const { isConnectionAllowed } = useCanvasOperations({ router });
-			expect(isConnectionAllowed(sourceNode, targetNode, NodeConnectionType.Main)).toBe(false);
+			expect(
+				isConnectionAllowed(
+					sourceNode,
+					targetNode,
+					NodeConnectionType.Main,
+					NodeConnectionType.Main,
+				),
+			).toBe(false);
 		});
 
-		it('should return false if input type does not match connection type', () => {
+		it('should return false if source node does not have connection type', () => {
 			const workflowsStore = mockedStore(useWorkflowsStore);
 			const nodeTypesStore = mockedStore(useNodeTypesStore);
 			const sourceNode = mockNode({
@@ -1135,14 +1189,17 @@ describe('useCanvasOperations', () => {
 				type: 'sourceType',
 				name: 'Source Node',
 			});
+			const sourceNodeTypeDescription = mockNodeTypeDescription({
+				name: sourceNode.type,
+				outputs: [NodeConnectionType.Main],
+			});
 
 			const targetNode = mockNode({
 				id: '2',
 				type: 'targetType',
 				name: 'Target Node',
 			});
-
-			const nodeTypeDescription = mockNodeTypeDescription({
+			const targetNodeTypeDescription = mockNodeTypeDescription({
 				name: 'targetType',
 				inputs: [NodeConnectionType.AiTool],
 			});
@@ -1154,9 +1211,70 @@ describe('useCanvasOperations', () => {
 
 			editableWorkflowObject.value.nodes[sourceNode.name] = sourceNode;
 			editableWorkflowObject.value.nodes[targetNode.name] = targetNode;
-			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+			nodeTypesStore.getNodeType = vi.fn(
+				(nodeTypeName: string) =>
+					({
+						[sourceNode.type]: sourceNodeTypeDescription,
+						[targetNode.type]: targetNodeTypeDescription,
+					})[nodeTypeName],
+			);
 
-			expect(isConnectionAllowed(sourceNode, targetNode, NodeConnectionType.Main)).toBe(false);
+			expect(
+				isConnectionAllowed(
+					sourceNode,
+					targetNode,
+					NodeConnectionType.AiTool,
+					NodeConnectionType.AiTool,
+				),
+			).toBe(false);
+		});
+
+		it('should return false if target node does not have connection type', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+			const sourceNode = mockNode({
+				id: '1',
+				type: 'sourceType',
+				name: 'Source Node',
+			});
+			const sourceNodeTypeDescription = mockNodeTypeDescription({
+				name: sourceNode.type,
+				outputs: [NodeConnectionType.Main],
+			});
+
+			const targetNode = mockNode({
+				id: '2',
+				type: 'targetType',
+				name: 'Target Node',
+			});
+			const targetNodeTypeDescription = mockNodeTypeDescription({
+				name: 'targetType',
+				inputs: [NodeConnectionType.AiTool],
+			});
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations({ router });
+
+			editableWorkflowObject.value.nodes[sourceNode.name] = sourceNode;
+			editableWorkflowObject.value.nodes[targetNode.name] = targetNode;
+			nodeTypesStore.getNodeType = vi.fn(
+				(nodeTypeName: string) =>
+					({
+						[sourceNode.type]: sourceNodeTypeDescription,
+						[targetNode.type]: targetNodeTypeDescription,
+					})[nodeTypeName],
+			);
+
+			expect(
+				isConnectionAllowed(
+					sourceNode,
+					targetNode,
+					NodeConnectionType.Main,
+					NodeConnectionType.AiTool,
+				),
+			).toBe(false);
 		});
 
 		it('should return false if source node type is not allowed by target node input filter', () => {
@@ -1168,6 +1286,10 @@ describe('useCanvasOperations', () => {
 				name: 'Source Node',
 				typeVersion: 1,
 			});
+			const sourceNodeTypeDescription = mockNodeTypeDescription({
+				name: sourceNode.type,
+				outputs: [NodeConnectionType.Main],
+			});
 
 			const targetNode = mockNode({
 				id: '2',
@@ -1175,8 +1297,7 @@ describe('useCanvasOperations', () => {
 				name: 'Target Node',
 				typeVersion: 1,
 			});
-
-			const nodeTypeDescription = mockNodeTypeDescription({
+			const targetNodeTypeDescription = mockNodeTypeDescription({
 				name: 'targetType',
 				inputs: [
 					{
@@ -1195,9 +1316,22 @@ describe('useCanvasOperations', () => {
 
 			editableWorkflowObject.value.nodes[sourceNode.name] = sourceNode;
 			editableWorkflowObject.value.nodes[targetNode.name] = targetNode;
-			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+			nodeTypesStore.getNodeType = vi.fn(
+				(nodeTypeName: string) =>
+					({
+						[sourceNode.type]: sourceNodeTypeDescription,
+						[targetNode.type]: targetNodeTypeDescription,
+					})[nodeTypeName],
+			);
 
-			expect(isConnectionAllowed(sourceNode, targetNode, NodeConnectionType.Main)).toBe(false);
+			expect(
+				isConnectionAllowed(
+					sourceNode,
+					targetNode,
+					NodeConnectionType.Main,
+					NodeConnectionType.Main,
+				),
+			).toBe(false);
 		});
 
 		it('should return true if all conditions including filter are met', () => {
@@ -1210,6 +1344,10 @@ describe('useCanvasOperations', () => {
 				name: 'Source Node',
 				typeVersion: 1,
 			});
+			const sourceNodeTypeDescription = mockNodeTypeDescription({
+				name: sourceNode.type,
+				outputs: [NodeConnectionType.Main],
+			});
 
 			const targetNode = mockNode({
 				id: '2',
@@ -1217,14 +1355,13 @@ describe('useCanvasOperations', () => {
 				name: 'Target Node',
 				typeVersion: 1,
 			});
-
-			const nodeTypeDescription = mockNodeTypeDescription({
-				name: 'targetType',
+			const targetNodeTypeDescription = mockNodeTypeDescription({
+				name: targetNode.type,
 				inputs: [
 					{
 						type: NodeConnectionType.Main,
 						filter: {
-							nodes: ['sourceType'],
+							nodes: [sourceNode.type],
 						},
 					},
 				],
@@ -1237,9 +1374,22 @@ describe('useCanvasOperations', () => {
 
 			editableWorkflowObject.value.nodes[sourceNode.name] = sourceNode;
 			editableWorkflowObject.value.nodes[targetNode.name] = targetNode;
-			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+			nodeTypesStore.getNodeType = vi.fn(
+				(nodeTypeName: string) =>
+					({
+						[sourceNode.type]: sourceNodeTypeDescription,
+						[targetNode.type]: targetNodeTypeDescription,
+					})[nodeTypeName],
+			);
 
-			expect(isConnectionAllowed(sourceNode, targetNode, NodeConnectionType.Main)).toBe(true);
+			expect(
+				isConnectionAllowed(
+					sourceNode,
+					targetNode,
+					NodeConnectionType.Main,
+					NodeConnectionType.Main,
+				),
+			).toBe(true);
 		});
 
 		it('should return true if all conditions are met and no filter is set', () => {
@@ -1252,6 +1402,10 @@ describe('useCanvasOperations', () => {
 				name: 'Source Node',
 				typeVersion: 1,
 			});
+			const sourceNodeTypeDescription = mockNodeTypeDescription({
+				name: sourceNode.type,
+				outputs: [NodeConnectionType.Main],
+			});
 
 			const targetNode = mockNode({
 				id: '2',
@@ -1259,9 +1413,8 @@ describe('useCanvasOperations', () => {
 				name: 'Target Node',
 				typeVersion: 1,
 			});
-
-			const nodeTypeDescription = mockNodeTypeDescription({
-				name: 'targetType',
+			const targetNodeTypeDescription = mockNodeTypeDescription({
+				name: targetNode.type,
 				inputs: [
 					{
 						type: NodeConnectionType.Main,
@@ -1276,9 +1429,60 @@ describe('useCanvasOperations', () => {
 
 			editableWorkflowObject.value.nodes[sourceNode.name] = sourceNode;
 			editableWorkflowObject.value.nodes[targetNode.name] = targetNode;
-			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+			nodeTypesStore.getNodeType = vi.fn(
+				(nodeTypeName: string) =>
+					({
+						[sourceNode.type]: sourceNodeTypeDescription,
+						[targetNode.type]: targetNodeTypeDescription,
+					})[nodeTypeName],
+			);
 
-			expect(isConnectionAllowed(sourceNode, targetNode, NodeConnectionType.Main)).toBe(true);
+			expect(
+				isConnectionAllowed(
+					sourceNode,
+					targetNode,
+					NodeConnectionType.Main,
+					NodeConnectionType.Main,
+				),
+			).toBe(true);
+		});
+
+		it('should return true if node connecting to itself', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			const sourceNode = mockNode({
+				id: '1',
+				type: 'sourceType',
+				name: 'Source Node',
+				typeVersion: 1,
+			});
+			const sourceNodeTypeDescription = mockNodeTypeDescription({
+				name: sourceNode.type,
+				outputs: [NodeConnectionType.Main],
+			});
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations({ router });
+
+			editableWorkflowObject.value.nodes[sourceNode.name] = sourceNode;
+			nodeTypesStore.getNodeType = vi.fn(
+				(nodeTypeName: string) =>
+					({
+						[sourceNode.type]: sourceNodeTypeDescription,
+					})[nodeTypeName],
+			);
+
+			expect(
+				isConnectionAllowed(
+					sourceNode,
+					sourceNode,
+					NodeConnectionType.Main,
+					NodeConnectionType.Main,
+				),
+			).toBe(true);
 		});
 	});
 
diff --git a/packages/editor-ui/src/composables/__tests__/useDocumentTitle.test.ts b/packages/editor-ui/src/composables/__tests__/useDocumentTitle.test.ts
new file mode 100644
index 0000000000..5a88ee570a
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useDocumentTitle.test.ts
@@ -0,0 +1,31 @@
+import { mock } from 'vitest-mock-extended';
+import { describe, it, expect } from 'vitest';
+import type { FrontendSettings } from '@n8n/api-types';
+import { useDocumentTitle } from '../useDocumentTitle';
+
+const settings = mock<FrontendSettings>({ releaseChannel: 'stable' });
+vi.mock('@/stores/settings.store', () => ({
+	useSettingsStore: vi.fn(() => ({ settings })),
+}));
+
+describe('useDocumentTitle', () => {
+	it('should set the document title', () => {
+		const { set } = useDocumentTitle();
+		set('Test Title');
+		expect(document.title).toBe('Test Title - n8n');
+	});
+
+	it('should reset the document title', () => {
+		const { set, reset } = useDocumentTitle();
+		set('Test Title');
+		reset();
+		expect(document.title).toBe('Workflow Automation - n8n');
+	});
+
+	it('should use the correct prefix for the release channel', () => {
+		settings.releaseChannel = 'beta';
+		const { set } = useDocumentTitle();
+		set('Test Title');
+		expect(document.title).toBe('Test Title - n8n[BETA]');
+	});
+});
diff --git a/packages/editor-ui/src/composables/__tests__/useKeybindings.test.ts b/packages/editor-ui/src/composables/__tests__/useKeybindings.test.ts
index 5383b9deeb..54c042c79a 100644
--- a/packages/editor-ui/src/composables/__tests__/useKeybindings.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useKeybindings.test.ts
@@ -1,7 +1,7 @@
 import { renderComponent } from '@/__tests__/render';
 import userEvent from '@testing-library/user-event';
 import { describe, expect, it, vi } from 'vitest';
-import { defineComponent, h } from 'vue';
+import { defineComponent, h, ref } from 'vue';
 import { useKeybindings } from '../useKeybindings';
 
 const renderTestComponent = async (...args: Parameters<typeof useKeybindings>) => {
@@ -19,7 +19,8 @@ describe('useKeybindings', () => {
 	it('should trigger case-insensitive keyboard shortcuts', async () => {
 		const saveSpy = vi.fn();
 		const saveAllSpy = vi.fn();
-		await renderTestComponent({ Ctrl_s: saveSpy, ctrl_Shift_S: saveAllSpy });
+		const keymap = ref({ Ctrl_s: saveSpy, ctrl_Shift_S: saveAllSpy });
+		await renderTestComponent(keymap);
 		await userEvent.keyboard('{Control>}s');
 		expect(saveSpy).toHaveBeenCalled();
 		expect(saveAllSpy).not.toHaveBeenCalled();
@@ -31,7 +32,8 @@ describe('useKeybindings', () => {
 	it('should not trigger shortcuts when an input element has focus', async () => {
 		const saveSpy = vi.fn();
 		const saveAllSpy = vi.fn();
-		const { getByRole } = await renderTestComponent({ Ctrl_s: saveSpy, ctrl_Shift_S: saveAllSpy });
+		const keymap = ref({ Ctrl_s: saveSpy, ctrl_Shift_S: saveAllSpy });
+		const { getByRole } = await renderTestComponent(keymap);
 
 		getByRole('textbox').focus();
 
@@ -41,4 +43,85 @@ describe('useKeybindings', () => {
 		expect(saveSpy).not.toHaveBeenCalled();
 		expect(saveAllSpy).not.toHaveBeenCalled();
 	});
+
+	it('should call the correct handler for a single key press', async () => {
+		const handler = vi.fn();
+		const keymap = ref({ a: handler });
+
+		useKeybindings(keymap);
+
+		const event = new KeyboardEvent('keydown', { key: 'a' });
+		document.dispatchEvent(event);
+
+		expect(handler).toHaveBeenCalled();
+	});
+
+	it('should call the correct handler for a combination key press', async () => {
+		const handler = vi.fn();
+		const keymap = ref({ 'ctrl+a': handler });
+
+		useKeybindings(keymap);
+
+		const event = new KeyboardEvent('keydown', { key: 'a', ctrlKey: true });
+		document.dispatchEvent(event);
+
+		expect(handler).toHaveBeenCalled();
+	});
+
+	it('should not call handler if key press is ignored', async () => {
+		const handler = vi.fn();
+		const keymap = ref({ a: handler });
+
+		useKeybindings(keymap);
+
+		const input = document.createElement('input');
+		document.body.appendChild(input);
+		input.focus();
+
+		const event = new KeyboardEvent('keydown', { key: 'a' });
+		document.dispatchEvent(event);
+
+		expect(handler).not.toHaveBeenCalled();
+		document.body.removeChild(input);
+	});
+
+	it('should not call handler if disabled', async () => {
+		const handler = vi.fn();
+		const keymap = ref({ a: handler });
+		const disabled = ref(true);
+
+		useKeybindings(keymap, { disabled });
+
+		const event = new KeyboardEvent('keydown', { key: 'a' });
+		document.dispatchEvent(event);
+
+		expect(handler).not.toHaveBeenCalled();
+	});
+
+	it('should normalize shortcut strings correctly', async () => {
+		const handler = vi.fn();
+		const keymap = ref({ 'ctrl+shift+a': handler });
+
+		useKeybindings(keymap);
+
+		const event = new KeyboardEvent('keydown', { key: 'A', ctrlKey: true, shiftKey: true });
+		document.dispatchEvent(event);
+
+		expect(handler).toHaveBeenCalled();
+	});
+
+	it('should normalize shortcut string alternatives correctly', async () => {
+		const handler = vi.fn();
+		const keymap = ref({ 'a|b': handler });
+
+		useKeybindings(keymap);
+
+		const eventA = new KeyboardEvent('keydown', { key: 'A' });
+		document.dispatchEvent(eventA);
+		expect(handler).toHaveBeenCalled();
+
+		const eventB = new KeyboardEvent('keydown', { key: 'B' });
+		document.dispatchEvent(eventB);
+		expect(handler).toHaveBeenCalledTimes(2);
+	});
 });
diff --git a/packages/editor-ui/src/composables/__tests__/useNodeConnections.spec.ts b/packages/editor-ui/src/composables/__tests__/useNodeConnections.spec.ts
index e4fef99039..fa532d6cd8 100644
--- a/packages/editor-ui/src/composables/__tests__/useNodeConnections.spec.ts
+++ b/packages/editor-ui/src/composables/__tests__/useNodeConnections.spec.ts
@@ -176,7 +176,7 @@ describe('useNodeConnections', () => {
 			connections: defaultConnections,
 		});
 
-		it('returns false if source and target nodes are the same', () => {
+		it('returns true if source and target nodes are the same', () => {
 			const connection = {
 				source: 'node1',
 				target: 'node1',
@@ -191,7 +191,7 @@ describe('useNodeConnections', () => {
 					index: 0,
 				}),
 			};
-			expect(isValidConnection(connection)).toBe(false);
+			expect(isValidConnection(connection)).toBe(true);
 		});
 
 		it('returns false if source and target handles are of the same mode', () => {
diff --git a/packages/editor-ui/src/composables/__tests__/useRunWorkflow.spec.ts b/packages/editor-ui/src/composables/__tests__/useRunWorkflow.spec.ts
index a1583280a9..0004354f50 100644
--- a/packages/editor-ui/src/composables/__tests__/useRunWorkflow.spec.ts
+++ b/packages/editor-ui/src/composables/__tests__/useRunWorkflow.spec.ts
@@ -6,7 +6,7 @@ import { ExpressionError, type IPinData, type IRunData, type Workflow } from 'n8
 
 import { useRootStore } from '@/stores/root.store';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
-import type { IStartRunData, IWorkflowData } from '@/Interface';
+import type { IExecutionResponse, IStartRunData, IWorkflowData } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
@@ -22,6 +22,7 @@ vi.mock('@/stores/workflows.store', () => ({
 		executionWaitingForWebhook: false,
 		getCurrentWorkflow: vi.fn().mockReturnValue({ id: '123' }),
 		getNodeByName: vi.fn(),
+		getExecution: vi.fn(),
 	}),
 }));
 
@@ -52,6 +53,7 @@ vi.mock('@/composables/useWorkflowHelpers', () => ({
 		getCurrentWorkflow: vi.fn(),
 		saveCurrentWorkflow: vi.fn(),
 		getWorkflowDataToSave: vi.fn(),
+		setDocumentTitle: vi.fn(),
 	}),
 }));
 
@@ -61,10 +63,6 @@ vi.mock('@/composables/useNodeHelpers', () => ({
 	}),
 }));
 
-vi.mock('@/composables/useTitleChange', () => ({
-	useTitleChange: vi.fn().mockReturnValue({ titleSet: vi.fn() }),
-}));
-
 vi.mock('vue-router', async (importOriginal) => {
 	const { RouterLink } = await importOriginal<typeof router>();
 	return {
@@ -306,4 +304,76 @@ describe('useRunWorkflow({ router })', () => {
 			expect(result.runData).toEqual(undefined);
 		});
 	});
+
+	describe('useRunWorkflow({ router }) - runWorkflowResolvePending', () => {
+		let uiStore: ReturnType<typeof useUIStore>;
+		let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+		let router: ReturnType<typeof useRouter>;
+
+		beforeAll(() => {
+			const pinia = createTestingPinia({ stubActions: false });
+			setActivePinia(pinia);
+			rootStore = useRootStore();
+			uiStore = useUIStore();
+			workflowsStore = useWorkflowsStore();
+			router = useRouter();
+			workflowHelpers = useWorkflowHelpers({ router });
+		});
+
+		beforeEach(() => {
+			uiStore.activeActions = [];
+			vi.mocked(workflowsStore).runWorkflow.mockReset();
+		});
+
+		it('should resolve when runWorkflow finished', async () => {
+			const { runWorkflowResolvePending } = useRunWorkflow({ router });
+			const mockExecutionResponse = { executionId: '123' };
+
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).allNodes = [];
+			vi.mocked(workflowsStore).getExecution.mockResolvedValue({
+				finished: true,
+			} as unknown as IExecutionResponse);
+			vi.mocked(workflowsStore).workflowExecutionData = {
+				id: '123',
+			} as unknown as IExecutionResponse;
+
+			const result = await runWorkflowResolvePending({});
+
+			expect(result).toEqual(mockExecutionResponse);
+		});
+
+		it('should return when workflowExecutionData is null', async () => {
+			const { runWorkflowResolvePending } = useRunWorkflow({ router });
+			const mockExecutionResponse = { executionId: '123' };
+
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).allNodes = [];
+			vi.mocked(workflowsStore).getExecution.mockResolvedValue({
+				finished: true,
+			} as unknown as IExecutionResponse);
+			vi.mocked(workflowsStore).workflowExecutionData = null;
+
+			const result = await runWorkflowResolvePending({});
+
+			expect(result).toEqual(mockExecutionResponse);
+		});
+
+		it('should handle workflow execution error properly', async () => {
+			const { runWorkflowResolvePending } = useRunWorkflow({ router });
+			const mockExecutionResponse = { executionId: '123' };
+
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).allNodes = [];
+			vi.mocked(workflowsStore).getExecution.mockResolvedValue({
+				finished: false,
+				status: 'error',
+			} as unknown as IExecutionResponse);
+
+			await runWorkflowResolvePending({});
+
+			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalled();
+			expect(workflowsStore.workflowExecutionData).toBe(null);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/composables/useAIAssistantHelpers.ts b/packages/editor-ui/src/composables/useAIAssistantHelpers.ts
new file mode 100644
index 0000000000..5adc3952fe
--- /dev/null
+++ b/packages/editor-ui/src/composables/useAIAssistantHelpers.ts
@@ -0,0 +1,256 @@
+import type {
+	IDataObject,
+	IRunExecutionData,
+	NodeApiError,
+	NodeError,
+	NodeOperationError,
+} from 'n8n-workflow';
+import { deepCopy, type INode } from 'n8n-workflow';
+import { useWorkflowHelpers } from './useWorkflowHelpers';
+import { useRouter } from 'vue-router';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { executionDataToJson, getMainAuthField, getNodeAuthOptions } from '@/utils/nodeTypesUtils';
+import type { ChatRequest } from '@/types/assistant.types';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useDataSchema } from './useDataSchema';
+import { VIEWS } from '@/constants';
+import { useI18n } from './useI18n';
+
+const CANVAS_VIEWS = [VIEWS.NEW_WORKFLOW, VIEWS.WORKFLOW, VIEWS.EXECUTION_DEBUG];
+const EXECUTION_VIEWS = [VIEWS.EXECUTION_PREVIEW];
+const WORKFLOW_LIST_VIEWS = [VIEWS.WORKFLOWS, VIEWS.PROJECTS_WORKFLOWS];
+const CREDENTIALS_LIST_VIEWS = [VIEWS.CREDENTIALS, VIEWS.PROJECTS_CREDENTIALS];
+
+export const useAIAssistantHelpers = () => {
+	const ndvStore = useNDVStore();
+	const nodeTypesStore = useNodeTypesStore();
+	const workflowsStore = useWorkflowsStore();
+
+	const workflowHelpers = useWorkflowHelpers({ router: useRouter() });
+	const locale = useI18n();
+
+	/**
+		Regular expression to extract the node names from the expressions in the template.
+		Supports single quotes, double quotes, and backticks.
+	*/
+	const entityRegex = /\$\(\s*(\\?["'`])((?:\\.|(?!\1)[^\\])*)\1\s*\)/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;
+	}
+
+	/**
+	 * Unescape quotes in the string. Supports single quotes, double quotes, and backticks.
+	 */
+	function unescapeQuotes(str: string): string {
+		return str.replace(/\\(['"`])/g, '$1');
+	}
+
+	/**
+	 * Extract the node names from the expressions in the node parameters.
+	 */
+	function getReferencedNodes(node: INode): string[] {
+		const referencedNodes: Set<string> = new Set();
+		if (!node) {
+			return [];
+		}
+		// Go through all parameters and check if they contain expressions on any level
+		for (const key in node.parameters) {
+			let names: string[] = [];
+			if (
+				node.parameters[key] &&
+				typeof node.parameters[key] === 'object' &&
+				Object.keys(node.parameters[key]).length
+			) {
+				names = extractNodeNames(JSON.stringify(node.parameters[key]));
+			} else if (typeof node.parameters[key] === 'string' && node.parameters[key]) {
+				names = extractNodeNames(node.parameters[key]);
+			}
+			if (names.length) {
+				names
+					.map((name) => unescapeQuotes(name))
+					.forEach((name) => {
+						referencedNodes.add(name);
+					});
+			}
+		}
+		return referencedNodes.size ? Array.from(referencedNodes) : [];
+	}
+
+	/**
+	 * Processes node object before sending it to AI assistant
+	 * - Removes unnecessary properties
+	 * - Extracts expressions from the parameters and resolves them
+	 * @param node original node object
+	 * @param propsToRemove properties to remove from the node object
+	 * @returns processed node
+	 */
+	function processNodeForAssistant(node: INode, propsToRemove: string[]): INode {
+		// Make a copy of the node object so we don't modify the original
+		const nodeForLLM = deepCopy(node);
+		propsToRemove.forEach((key) => {
+			delete nodeForLLM[key as keyof INode];
+		});
+		const resolvedParameters = workflowHelpers.getNodeParametersWithResolvedExpressions(
+			nodeForLLM.parameters,
+		);
+		nodeForLLM.parameters = resolvedParameters;
+		return nodeForLLM;
+	}
+
+	function getNodeInfoForAssistant(node: INode): ChatRequest.NodeInfo {
+		if (!node) {
+			return {};
+		}
+		// Get all referenced nodes and their schemas
+		const referencedNodeNames = getReferencedNodes(node);
+		const schemas = getNodesSchemas(referencedNodeNames);
+
+		const nodeType = nodeTypesStore.getNodeType(node.type);
+
+		// Get node credentials details for the ai assistant
+		let authType = undefined;
+		if (nodeType) {
+			const authField = getMainAuthField(nodeType);
+			const credentialInUse = node.parameters[authField?.name ?? ''];
+			const availableAuthOptions = getNodeAuthOptions(nodeType);
+			authType = availableAuthOptions.find((option) => option.value === credentialInUse);
+		}
+		let nodeInputData: { inputNodeName?: string; inputData?: IDataObject } | undefined = undefined;
+		const ndvInput = ndvStore.ndvInputData;
+		if (isNodeReferencingInputData(node) && ndvInput?.length) {
+			const inputData = ndvStore.ndvInputData[0].json;
+			const inputNodeName = ndvStore.input.nodeName;
+			nodeInputData = {
+				inputNodeName,
+				inputData,
+			};
+		}
+		return {
+			authType,
+			schemas,
+			nodeInputData,
+		};
+	}
+
+	/**
+	 * Simplify node error object for AI assistant
+	 */
+	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 isNodeReferencingInputData(node: INode): boolean {
+		const parametersString = JSON.stringify(node.parameters);
+		const references = ['$json', '$input', '$binary'];
+		return references.some((ref) => parametersString.includes(ref));
+	}
+
+	/**
+	 * 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 NodeExecutionSchema objects
+	 */
+	function getNodesSchemas(nodeNames: string[]) {
+		const schemas: ChatRequest.NodeExecutionSchema[] = [];
+		for (const name of nodeNames) {
+			const node = workflowsStore.getNodeByName(name);
+			if (!node) {
+				continue;
+			}
+			const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
+			const schema = getSchemaForExecutionData(executionDataToJson(getInputDataWithPinned(node)));
+			schemas.push({
+				nodeName: node.name,
+				schema,
+			});
+		}
+		return schemas;
+	}
+
+	function getCurrentViewDescription(view: VIEWS) {
+		switch (true) {
+			case WORKFLOW_LIST_VIEWS.includes(view):
+				return locale.baseText('aiAssistant.prompts.currentView.workflowList');
+			case CREDENTIALS_LIST_VIEWS.includes(view):
+				return locale.baseText('aiAssistant.prompts.currentView.credentialsList');
+			case EXECUTION_VIEWS.includes(view):
+				return locale.baseText('aiAssistant.prompts.currentView.executionsView');
+			case CANVAS_VIEWS.includes(view):
+				return locale.baseText('aiAssistant.prompts.currentView.workflowEditor');
+			default:
+				return undefined;
+		}
+	}
+	/**
+	 * Prepare workflow execution result data for the AI assistant
+	 * by removing data from nodes
+	 **/
+	function simplifyResultData(
+		data: IRunExecutionData['resultData'],
+	): ChatRequest.ExecutionResultData {
+		const simplifiedResultData: ChatRequest.ExecutionResultData = {
+			runData: {},
+		};
+
+		// Handle optional error
+		if (data.error) {
+			simplifiedResultData.error = data.error;
+		}
+		// Map runData, excluding the `data` field from ITaskData
+		Object.keys(data.runData).forEach((key) => {
+			const taskDataArray = data.runData[key];
+			simplifiedResultData.runData[key] = taskDataArray.map((taskData) => {
+				const { data: taskDataContent, ...taskDataWithoutData } = taskData;
+				return taskDataWithoutData;
+			});
+		});
+		// Handle lastNodeExecuted if it exists
+		if (data.lastNodeExecuted) {
+			simplifiedResultData.lastNodeExecuted = data.lastNodeExecuted;
+		}
+		// Handle metadata if it exists
+		if (data.metadata) {
+			simplifiedResultData.metadata = data.metadata;
+		}
+		return simplifiedResultData;
+	}
+
+	return {
+		processNodeForAssistant,
+		getNodeInfoForAssistant,
+		simplifyErrorForAssistant,
+		isNodeReferencingInputData,
+		getNodesSchemas,
+		getCurrentViewDescription,
+		getReferencedNodes,
+		simplifyResultData,
+	};
+};
diff --git a/packages/editor-ui/src/composables/useCanvas.ts b/packages/editor-ui/src/composables/useCanvas.ts
index 5c534104d8..57031a233b 100644
--- a/packages/editor-ui/src/composables/useCanvas.ts
+++ b/packages/editor-ui/src/composables/useCanvas.ts
@@ -5,8 +5,10 @@ export function useCanvas() {
 	const canvas = inject(CanvasKey);
 
 	const connectingHandle = computed(() => canvas?.connectingHandle.value);
+	const isExecuting = computed(() => canvas?.isExecuting.value);
 
 	return {
+		isExecuting,
 		connectingHandle,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.spec.ts b/packages/editor-ui/src/composables/useCanvasMapping.spec.ts
index 9b78ecffad..059b36a988 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.spec.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.spec.ts
@@ -543,6 +543,141 @@ describe('useCanvasMapping', () => {
 				});
 			});
 		});
+
+		describe('additionalNodePropertiesById', () => {
+			it('should return empty object when there are no sticky nodes', () => {
+				const nodes = ref([]);
+				const connections = {};
+				const workflowObject = createTestWorkflowObject();
+				const { additionalNodePropertiesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+				expect(additionalNodePropertiesById.value).toEqual({});
+			});
+
+			it('should calculate zIndex correctly for a single sticky node', () => {
+				const nodes = [
+					createTestNode({
+						id: '1',
+						type: STICKY_NODE_TYPE,
+						position: [0, 0],
+						parameters: { width: 100, height: 100 },
+					}),
+				];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject();
+				const { additionalNodePropertiesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+				expect(additionalNodePropertiesById.value[nodes[0].id]).toEqual({
+					style: { zIndex: -100 },
+				});
+			});
+
+			it('should calculate zIndex correctly for multiple sticky nodes with no overlap', () => {
+				const nodes = [
+					createTestNode({
+						id: '1',
+						type: STICKY_NODE_TYPE,
+						position: [0, 0],
+						parameters: { width: 100, height: 100 },
+					}),
+					createTestNode({
+						id: '2',
+						type: STICKY_NODE_TYPE,
+						position: [200, 200],
+						parameters: { width: 100, height: 100 },
+					}),
+				];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject();
+				const { additionalNodePropertiesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(additionalNodePropertiesById.value[nodes[0].id]).toEqual({
+					style: { zIndex: -100 },
+				});
+				expect(additionalNodePropertiesById.value[nodes[1].id]).toEqual({ style: { zIndex: -99 } });
+			});
+
+			it('should calculate zIndex correctly for overlapping sticky nodes', () => {
+				const nodes = [
+					createTestNode({
+						id: '1',
+						type: STICKY_NODE_TYPE,
+						position: [50, 50],
+						parameters: { width: 100, height: 100 },
+					}),
+					createTestNode({
+						id: '2',
+						type: STICKY_NODE_TYPE,
+						position: [0, 0],
+						parameters: { width: 150, height: 150 },
+					}),
+				];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject();
+				const { additionalNodePropertiesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(additionalNodePropertiesById.value[nodes[0].id]).toEqual({
+					style: { zIndex: -99 },
+				});
+				expect(additionalNodePropertiesById.value[nodes[1].id]).toEqual({
+					style: { zIndex: -100 },
+				});
+			});
+
+			it('calculates zIndex correctly for multiple overlapping sticky nodes', () => {
+				const nodes = [
+					createTestNode({
+						id: '1',
+						type: STICKY_NODE_TYPE,
+						position: [0, 0],
+						parameters: { width: 100, height: 100 },
+					}),
+					createTestNode({
+						id: '2',
+						type: STICKY_NODE_TYPE,
+						position: [25, 25],
+						parameters: { width: 50, height: 50 },
+					}),
+					createTestNode({
+						id: '3',
+						type: STICKY_NODE_TYPE,
+						position: [50, 50],
+						parameters: { width: 100, height: 100 },
+					}),
+				];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject();
+				const { additionalNodePropertiesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(additionalNodePropertiesById.value[nodes[0].id]).toEqual({
+					style: { zIndex: -100 },
+				});
+				expect(additionalNodePropertiesById.value[nodes[1].id]).toEqual({
+					style: { zIndex: -98 },
+				});
+				expect(additionalNodePropertiesById.value[nodes[2].id]).toEqual({
+					style: { zIndex: -99 },
+				});
+			});
+		});
 	});
 
 	describe('connections', () => {
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.ts b/packages/editor-ui/src/composables/useCanvasMapping.ts
index 2561dde544..fe33c1854c 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.ts
@@ -9,6 +9,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { Ref } from 'vue';
 import { computed } from 'vue';
 import type {
+	BoundingBox,
 	CanvasConnection,
 	CanvasConnectionData,
 	CanvasConnectionPort,
@@ -22,6 +23,7 @@ import type {
 } from '@/types';
 import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
 import {
+	checkOverlap,
 	mapLegacyConnectionsToCanvasConnections,
 	mapLegacyEndpointsToCanvasConnectionPort,
 	parseCanvasConnectionHandleString,
@@ -34,9 +36,14 @@ import type {
 	ITaskData,
 	Workflow,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+import { NodeConnectionType, NodeHelpers, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 import type { INodeUi } from '@/Interface';
-import { CUSTOM_API_CALL_KEY, STICKY_NODE_TYPE, WAIT_TIME_UNLIMITED } from '@/constants';
+import {
+	CUSTOM_API_CALL_KEY,
+	STICKY_NODE_TYPE,
+	WAIT_NODE_TYPE,
+	WAIT_TIME_UNLIMITED,
+} from '@/constants';
 import { sanitizeHtml } from '@/utils/htmlUtils';
 import { MarkerType } from '@vue-flow/core';
 import { useNodeHelpers } from './useNodeHelpers';
@@ -231,7 +238,8 @@ export function useCanvasMapping({
 	const nodeExecutionStatusById = computed(() =>
 		nodes.value.reduce<Record<string, ExecutionStatus>>((acc, node) => {
 			acc[node.id] =
-				workflowsStore.getWorkflowRunData?.[node.name]?.filter(Boolean)[0].executionStatus ?? 'new';
+				workflowsStore.getWorkflowRunData?.[node.name]?.filter(Boolean)[0]?.executionStatus ??
+				'new';
 			return acc;
 		}, {}),
 	);
@@ -325,8 +333,26 @@ export function useCanvasMapping({
 			if (workflowExecution && lastNodeExecuted && isExecutionSummary(workflowExecution)) {
 				if (
 					node.name === workflowExecution.data?.resultData?.lastNodeExecuted &&
-					workflowExecution.waitTill
+					workflowExecution?.waitTill &&
+					!workflowExecution?.finished
 				) {
+					if (
+						node &&
+						node.type === WAIT_NODE_TYPE &&
+						['webhook', 'form'].includes(node.parameters.resume as string)
+					) {
+						acc[node.id] =
+							node.parameters.resume === 'webhook'
+								? i18n.baseText('node.theNodeIsWaitingWebhookCall')
+								: i18n.baseText('node.theNodeIsWaitingFormCall');
+						return acc;
+					}
+
+					if (node?.parameters.operation === SEND_AND_WAIT_OPERATION) {
+						acc[node.id] = i18n.baseText('node.theNodeIsWaitingUserInput');
+						return acc;
+					}
+
 					const waitDate = new Date(workflowExecution.waitTill);
 
 					if (waitDate.toISOString() === WAIT_TIME_UNLIMITED) {
@@ -349,17 +375,68 @@ export function useCanvasMapping({
 	);
 
 	const additionalNodePropertiesById = computed(() => {
-		return nodes.value.reduce<Record<string, Partial<CanvasNode>>>((acc, node) => {
+		type StickyNoteBoundingBox = BoundingBox & {
+			id: string;
+			area: number;
+			zIndex: number;
+		};
+
+		const stickyNodeBaseZIndex = -100;
+
+		const stickyNodeBoundingBoxes = nodes.value.reduce<StickyNoteBoundingBox[]>((acc, node) => {
 			if (node.type === STICKY_NODE_TYPE) {
-				acc[node.id] = {
-					style: {
-						zIndex: -1,
-					},
-				};
+				const x = node.position[0];
+				const y = node.position[1];
+				const width = node.parameters.width as number;
+				const height = node.parameters.height as number;
+
+				acc.push({
+					id: node.id,
+					x,
+					y,
+					width,
+					height,
+					area: width * height,
+					zIndex: stickyNodeBaseZIndex,
+				});
 			}
 
 			return acc;
-		}, {});
+		}, []);
+
+		const sortedStickyNodeBoundingBoxes = stickyNodeBoundingBoxes.sort((a, b) => b.area - a.area);
+		sortedStickyNodeBoundingBoxes.forEach((node, index) => {
+			node.zIndex = stickyNodeBaseZIndex + index;
+		});
+
+		for (let i = 0; i < sortedStickyNodeBoundingBoxes.length; i++) {
+			const node1 = sortedStickyNodeBoundingBoxes[i];
+			for (let j = i + 1; j < sortedStickyNodeBoundingBoxes.length; j++) {
+				const node2 = sortedStickyNodeBoundingBoxes[j];
+				if (checkOverlap(node1, node2)) {
+					if (node1.area < node2.area && node1.zIndex <= node2.zIndex) {
+						// Ensure node1 (smaller area) has a higher zIndex than node2 (larger area)
+						node1.zIndex = node2.zIndex + 1;
+					} else if (node2.area < node1.area && node2.zIndex <= node1.zIndex) {
+						// Ensure node2 (smaller area) has a higher zIndex than node1 (larger area)
+						node2.zIndex = node1.zIndex + 1;
+					}
+				}
+			}
+		}
+
+		return sortedStickyNodeBoundingBoxes.reduce<Record<string, Partial<CanvasNode>>>(
+			(acc, node) => {
+				acc[node.id] = {
+					style: {
+						zIndex: node.zIndex,
+					},
+				};
+
+				return acc;
+			},
+			{},
+		);
 	});
 
 	const mappedNodes = computed<CanvasNode[]>(() => [
@@ -373,7 +450,7 @@ export function useCanvasMapping({
 				subtitle: nodeSubtitleById.value[node.id] ?? '',
 				type: node.type,
 				typeVersion: node.typeVersion,
-				disabled: !!node.disabled,
+				disabled: node.disabled,
 				inputs: nodeInputsById.value[node.id] ?? [],
 				outputs: nodeOutputsById.value[node.id] ?? [],
 				connections: {
@@ -436,6 +513,10 @@ export function useCanvasMapping({
 
 		let status: CanvasConnectionData['status'];
 		if (fromNode) {
+			const { type, index } = parseCanvasConnectionHandleString(connection.sourceHandle);
+			const runDataTotal =
+				nodeExecutionRunDataOutputMapById.value[fromNode.id]?.[type]?.[index]?.total ?? 0;
+
 			if (nodeExecutionRunningById.value[fromNode.id]) {
 				status = 'running';
 			} else if (
@@ -445,7 +526,7 @@ export function useCanvasMapping({
 				status = 'pinned';
 			} else if (nodeHasIssuesById.value[fromNode.id]) {
 				status = 'error';
-			} else if (nodeExecutionRunDataById.value[fromNode.id]) {
+			} else if (runDataTotal > 0) {
 				status = 'success';
 			}
 		}
@@ -487,6 +568,7 @@ export function useCanvasMapping({
 	}
 
 	return {
+		additionalNodePropertiesById,
 		nodeExecutionRunDataOutputMapById,
 		connections: mappedConnections,
 		nodes: mappedNodes,
diff --git a/packages/editor-ui/src/composables/useCanvasNodeHandle.ts b/packages/editor-ui/src/composables/useCanvasNodeHandle.ts
index b7be32a25f..596fbd45d6 100644
--- a/packages/editor-ui/src/composables/useCanvasNodeHandle.ts
+++ b/packages/editor-ui/src/composables/useCanvasNodeHandle.ts
@@ -15,6 +15,7 @@ export function useCanvasNodeHandle() {
 	const isConnected = computed(() => handle?.isConnected.value ?? false);
 	const isConnecting = computed(() => handle?.isConnecting.value ?? false);
 	const isReadOnly = computed(() => handle?.isReadOnly.value);
+	const isRequired = computed(() => handle?.isRequired.value);
 	const type = computed(() => handle?.type.value ?? NodeConnectionType.Main);
 	const mode = computed(() => handle?.mode.value ?? CanvasConnectionMode.Input);
 	const index = computed(() => handle?.index.value ?? 0);
@@ -25,6 +26,7 @@ export function useCanvasNodeHandle() {
 		isConnected,
 		isConnecting,
 		isReadOnly,
+		isRequired,
 		type,
 		mode,
 		index,
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/editor-ui/src/composables/useCanvasOperations.ts
index c27ba12db8..3cae57885b 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.ts
@@ -58,7 +58,6 @@ import type {
 import { CanvasConnectionMode } from '@/types';
 import {
 	createCanvasConnectionHandleString,
-	getUniqueNodeName,
 	mapCanvasConnectionToLegacyConnection,
 	mapLegacyConnectionsToCanvasConnections,
 	mapLegacyConnectionToCanvasConnection,
@@ -96,6 +95,7 @@ import { v4 as uuid } from 'uuid';
 import { computed, nextTick, ref } from 'vue';
 import type { useRouter } from 'vue-router';
 import { useClipboard } from '@/composables/useClipboard';
+import { useUniqueNodeName } from '@/composables/useUniqueNodeName';
 import { isPresent } from '../utils/typesUtils';
 
 type AddNodeData = Partial<INodeUi> & {
@@ -135,6 +135,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	const telemetry = useTelemetry();
 	const externalHooks = useExternalHooks();
 	const clipboard = useClipboard();
+	const { uniqueNodeName } = useUniqueNodeName();
 
 	const lastClickPosition = ref<XYPosition>([0, 0]);
 
@@ -163,7 +164,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			updateNodePosition(id, position, { trackHistory });
 		});
 
-		if (trackBulk) {
+		if (trackHistory && trackBulk) {
 			historyStore.stopRecordingUndo();
 		}
 	}
@@ -197,16 +198,20 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		updateNodePosition(node.id, position);
 	}
 
-	async function renameNode(currentName: string, newName: string, { trackHistory = false } = {}) {
+	async function renameNode(
+		currentName: string,
+		newName: string,
+		{ trackHistory = false, trackBulk = true } = {},
+	) {
 		if (currentName === newName) {
 			return;
 		}
 
-		if (trackHistory) {
+		if (trackHistory && trackBulk) {
 			historyStore.startRecordingUndo();
 		}
 
-		newName = getUniqueNodeName(newName, workflowsStore.canvasNames);
+		newName = uniqueNodeName(newName);
 
 		// Rename the node and update the connections
 		const workflow = workflowsStore.getCurrentWorkflow(true);
@@ -227,7 +232,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			ndvStore.activeNodeName = newName;
 		}
 
-		if (trackHistory) {
+		if (trackHistory && trackBulk) {
 			historyStore.stopRecordingUndo();
 		}
 	}
@@ -307,7 +312,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		}
 
 		if (uiStore.lastInteractedWithNodeId === id) {
-			uiStore.lastInteractedWithNodeId = null;
+			uiStore.lastInteractedWithNodeId = undefined;
 		}
 
 		connectAdjacentNodes(id, { trackHistory });
@@ -327,10 +332,16 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		trackDeleteNode(id);
 	}
 
-	function deleteNodes(ids: string[]) {
-		historyStore.startRecordingUndo();
-		ids.forEach((id) => deleteNode(id, { trackHistory: true, trackBulk: false }));
-		historyStore.stopRecordingUndo();
+	function deleteNodes(ids: string[], { trackHistory = true, trackBulk = true } = {}) {
+		if (trackHistory && trackBulk) {
+			historyStore.startRecordingUndo();
+		}
+
+		ids.forEach((id) => deleteNode(id, { trackHistory, trackBulk: false }));
+
+		if (trackHistory && trackBulk) {
+			historyStore.stopRecordingUndo();
+		}
 	}
 
 	function revertDeleteNode(node: INodeUi) {
@@ -387,7 +398,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 	function setNodeSelected(id?: string) {
 		if (!id) {
-			uiStore.lastInteractedWithNodeId = null;
+			uiStore.lastInteractedWithNodeId = undefined;
 			uiStore.lastSelectedNode = '';
 			return;
 		}
@@ -401,18 +412,15 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		uiStore.lastSelectedNode = node.name;
 	}
 
-	function toggleNodesDisabled(
-		ids: string[],
-		{ trackHistory = true, trackBulk = true }: { trackHistory?: boolean; trackBulk?: boolean } = {},
-	) {
-		if (trackBulk) {
+	function toggleNodesDisabled(ids: string[], { trackHistory = true, trackBulk = true } = {}) {
+		if (trackHistory && trackBulk) {
 			historyStore.startRecordingUndo();
 		}
 
 		const nodes = workflowsStore.getNodesByIds(ids);
-		nodeHelpers.disableNodes(nodes, trackHistory);
+		nodeHelpers.disableNodes(nodes, { trackHistory, trackBulk: false });
 
-		if (trackBulk) {
+		if (trackHistory && trackBulk) {
 			historyStore.stopRecordingUndo();
 		}
 	}
@@ -424,8 +432,14 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		}
 	}
 
-	function toggleNodesPinned(ids: string[], source: PinDataSource) {
-		historyStore.startRecordingUndo();
+	function toggleNodesPinned(
+		ids: string[],
+		source: PinDataSource,
+		{ trackHistory = true, trackBulk = true } = {},
+	) {
+		if (trackHistory && trackBulk) {
+			historyStore.startRecordingUndo();
+		}
 
 		const nodes = workflowsStore.getNodesByIds(ids);
 		const nextStatePinned = nodes.some((node) => !workflowsStore.pinDataByNodeName(node.name));
@@ -442,7 +456,9 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			}
 		}
 
-		historyStore.stopRecordingUndo();
+		if (trackHistory && trackBulk) {
+			historyStore.stopRecordingUndo();
+		}
 	}
 
 	function requireNodeTypeDescription(
@@ -478,10 +494,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		let insertPosition = options.position;
 		let lastAddedNode: INodeUi | undefined;
 
-		if (options.trackBulk) {
-			historyStore.startRecordingUndo();
-		}
-
 		const nodesWithTypeVersion = nodes.map((node) => {
 			const typeVersion =
 				node.typeVersion ?? resolveNodeVersion(requireNodeTypeDescription(node.type));
@@ -493,7 +505,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 		await loadNodeTypesProperties(nodesWithTypeVersion);
 
-		if (options.trackBulk) {
+		if (options.trackHistory && options.trackBulk) {
 			historyStore.startRecordingUndo();
 		}
 
@@ -532,7 +544,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			updatePositionForNodeWithMultipleInputs(lastAddedNode);
 		}
 
-		if (options.trackBulk) {
+		if (options.trackHistory && options.trackBulk) {
 			historyStore.stopRecordingUndo();
 		}
 
@@ -557,15 +569,13 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		}
 	}
 
-	function addNode(
-		node: AddNodeDataWithTypeVersion,
-		nodeTypeDescription: INodeTypeDescription,
-		options: AddNodeOptions = {},
-	): INodeUi {
-		// Check if maximum allowed number of this type of node has been reached
+	/**
+	 * Check if maximum allowed number of this type of node has been reached
+	 */
+	function checkMaxNodesOfTypeReached(nodeTypeDescription: INodeTypeDescription) {
 		if (
 			nodeTypeDescription.maxNodes !== undefined &&
-			workflowHelpers.getNodeTypeCount(node.type) >= nodeTypeDescription.maxNodes
+			workflowHelpers.getNodeTypeCount(nodeTypeDescription.name) >= nodeTypeDescription.maxNodes
 		) {
 			throw new Error(
 				i18n.baseText('nodeView.showMessage.showMaxNodeTypeError.message', {
@@ -574,20 +584,33 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 				}),
 			);
 		}
+	}
+
+	function addNode(
+		node: AddNodeDataWithTypeVersion,
+		nodeTypeDescription: INodeTypeDescription,
+		options: AddNodeOptions = {},
+	): INodeUi {
+		checkMaxNodesOfTypeReached(nodeTypeDescription);
 
 		const nodeData = resolveNodeData(node, nodeTypeDescription);
 		if (!nodeData) {
 			throw new Error(i18n.baseText('nodeViewV2.showError.failedToCreateNode'));
 		}
 
-		nodeHelpers.matchCredentials(nodeData);
+		workflowsStore.addNode(nodeData);
+
+		if (options.trackHistory) {
+			historyStore.pushCommandToUndo(new AddNodeCommand(nodeData));
+		}
 
 		void nextTick(() => {
-			if (options.trackHistory) {
-				historyStore.pushCommandToUndo(new AddNodeCommand(nodeData));
-			}
+			workflowsStore.setNodePristine(nodeData.name, true);
 
-			workflowsStore.addNode(nodeData);
+			nodeHelpers.matchCredentials(nodeData);
+			nodeHelpers.updateNodeParameterIssues(nodeData);
+			nodeHelpers.updateNodeCredentialIssues(nodeData);
+			nodeHelpers.updateNodeInputIssues(nodeData);
 
 			if (!options.isAutoAdd) {
 				createConnectionToLastInteractedWithNode(nodeData, options);
@@ -599,15 +622,13 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 			if (nodeData.type !== STICKY_NODE_TYPE) {
 				void externalHooks.run('nodeView.addNodeButton', { nodeTypeName: nodeData.type });
-			}
 
-			if (options.openNDV && !preventOpeningNDV) {
-				ndvStore.setActiveNodeName(nodeData.name);
+				if (options.openNDV && !preventOpeningNDV) {
+					ndvStore.setActiveNodeName(nodeData.name);
+				}
 			}
 		});
 
-		workflowsStore.setNodePristine(nodeData.name, true);
-
 		return nodeData;
 	}
 
@@ -879,6 +900,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		let position: XYPosition | undefined = node.position;
 		let pushOffsets: XYPosition = [40, 40];
 
+		if (position) {
+			return NodeViewUtils.getNewNodePosition(workflowsStore.allNodes, position, pushOffsets);
+		}
+
 		// Available when
 		// - clicking the plus button of a node handle
 		// - dragging an edge / connection of a node handle
@@ -913,7 +938,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 				position = [newNodeInsertPosition[0] + xOffset, newNodeInsertPosition[1] + yOffset];
 
-				uiStore.lastCancelledConnectionPosition = null;
+				uiStore.lastCancelledConnectionPosition = undefined;
 			} else if (lastInteractedWithNodeTypeDescription) {
 				// When
 				// - clicking the plus button of a node handle
@@ -1064,7 +1089,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	function resolveNodeName(node: INodeUi) {
 		const localizedName = i18n.localizeNodeName(node.name, node.type);
 
-		node.name = getUniqueNodeName(localizedName, workflowsStore.canvasNames);
+		node.name = uniqueNodeName(localizedName);
 	}
 
 	function resolveNodeWebhook(node: INodeUi, nodeTypeDescription: INodeTypeDescription) {
@@ -1137,7 +1162,14 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			connection,
 		);
 
-		if (!isConnectionAllowed(sourceNode, targetNode, mappedConnection[1].type)) {
+		if (
+			!isConnectionAllowed(
+				sourceNode,
+				targetNode,
+				mappedConnection[0].type,
+				mappedConnection[1].type,
+			)
+		) {
 			return;
 		}
 
@@ -1145,8 +1177,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			connection: mappedConnection,
 		});
 
-		nodeHelpers.updateNodeInputIssues(sourceNode);
-		nodeHelpers.updateNodeInputIssues(targetNode);
+		void nextTick(() => {
+			nodeHelpers.updateNodeInputIssues(sourceNode);
+			nodeHelpers.updateNodeInputIssues(targetNode);
+		});
 
 		uiStore.stateIsDirty = true;
 	}
@@ -1272,11 +1306,12 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	function isConnectionAllowed(
 		sourceNode: INodeUi,
 		targetNode: INodeUi,
-		connectionType: NodeConnectionType,
+		sourceConnectionType: NodeConnectionType,
+		targetConnectionType: NodeConnectionType,
 	): boolean {
 		const blocklist = [STICKY_NODE_TYPE];
 
-		if (sourceNode.id === targetNode.id) {
+		if (sourceConnectionType !== targetConnectionType) {
 			return false;
 		}
 
@@ -1284,70 +1319,105 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			return false;
 		}
 
+		const sourceNodeType = nodeTypesStore.getNodeType(sourceNode.type, sourceNode.typeVersion);
+		const sourceWorkflowNode = editableWorkflowObject.value.getNode(sourceNode.name);
+		if (!sourceWorkflowNode) {
+			return false;
+		}
+
+		let sourceNodeOutputs: Array<NodeConnectionType | INodeOutputConfiguration> = [];
+		if (sourceNodeType) {
+			sourceNodeOutputs =
+				NodeHelpers.getNodeOutputs(
+					editableWorkflowObject.value,
+					sourceWorkflowNode,
+					sourceNodeType,
+				) || [];
+		}
+
+		const sourceNodeHasOutputConnectionOfType = !!sourceNodeOutputs.find((output) => {
+			const outputType = typeof output === 'string' ? output : output.type;
+			return outputType === sourceConnectionType;
+		});
+
+		if (!sourceNodeHasOutputConnectionOfType) {
+			return false;
+		}
+
 		const targetNodeType = nodeTypesStore.getNodeType(targetNode.type, targetNode.typeVersion);
-		if (targetNodeType?.inputs?.length) {
-			const workflowNode = editableWorkflowObject.value.getNode(targetNode.name);
-			if (!workflowNode) {
+		const targetWorkflowNode = editableWorkflowObject.value.getNode(targetNode.name);
+		if (!targetWorkflowNode) {
+			return false;
+		}
+
+		let targetNodeInputs: Array<NodeConnectionType | INodeInputConfiguration> = [];
+		if (targetNodeType) {
+			targetNodeInputs =
+				NodeHelpers.getNodeInputs(
+					editableWorkflowObject.value,
+					targetWorkflowNode,
+					targetNodeType,
+				) || [];
+		}
+
+		const targetNodeHasInputConnectionOfType = !!targetNodeInputs.find((input) => {
+			const inputType = typeof input === 'string' ? input : input.type;
+			if (inputType !== targetConnectionType) return false;
+
+			const filter = typeof input === 'object' && 'filter' in input ? input.filter : undefined;
+			if (filter?.nodes.length && !filter.nodes.includes(sourceNode.type)) {
+				toast.showToast({
+					title: i18n.baseText('nodeView.showError.nodeNodeCompatible.title'),
+					message: i18n.baseText('nodeView.showError.nodeNodeCompatible.message', {
+						interpolate: { sourceNodeName: sourceNode.name, targetNodeName: targetNode.name },
+					}),
+					type: 'error',
+					duration: 5000,
+				});
+
 				return false;
 			}
 
-			let inputs: Array<NodeConnectionType | INodeInputConfiguration> = [];
-			if (targetNodeType) {
-				inputs =
-					NodeHelpers.getNodeInputs(editableWorkflowObject.value, workflowNode, targetNodeType) ||
-					[];
-			}
+			return true;
+		});
 
-			let targetHasConnectionTypeAsInput = false;
-			for (const input of inputs) {
-				const inputType = typeof input === 'string' ? input : input.type;
-				if (inputType === connectionType) {
-					if (typeof input === 'object' && 'filter' in input && input.filter?.nodes.length) {
-						if (!input.filter.nodes.includes(sourceNode.type)) {
-							// this.dropPrevented = true;
-							toast.showToast({
-								title: i18n.baseText('nodeView.showError.nodeNodeCompatible.title'),
-								message: i18n.baseText('nodeView.showError.nodeNodeCompatible.message', {
-									interpolate: { sourceNodeName: sourceNode.name, targetNodeName: targetNode.name },
-								}),
-								type: 'error',
-								duration: 5000,
-							});
-
-							return false;
-						}
-					}
-
-					targetHasConnectionTypeAsInput = true;
-				}
-			}
-
-			return targetHasConnectionTypeAsInput;
-		}
-
-		return false;
+		return targetNodeHasInputConnectionOfType;
 	}
 
-	function addConnections(connections: CanvasConnectionCreateData[] | CanvasConnection[]) {
+	function addConnections(
+		connections: CanvasConnectionCreateData[] | CanvasConnection[],
+		{ trackBulk = true, trackHistory = false } = {},
+	) {
+		if (trackBulk && trackHistory) {
+			historyStore.startRecordingUndo();
+		}
+
 		for (const { source, target, data } of connections) {
-			createConnection({
-				source,
-				sourceHandle: createCanvasConnectionHandleString({
-					mode: CanvasConnectionMode.Output,
-					type: isValidNodeConnectionType(data?.source.type)
-						? data?.source.type
-						: NodeConnectionType.Main,
-					index: data?.source.index ?? 0,
-				}),
-				target,
-				targetHandle: createCanvasConnectionHandleString({
-					mode: CanvasConnectionMode.Input,
-					type: isValidNodeConnectionType(data?.target.type)
-						? data?.target.type
-						: NodeConnectionType.Main,
-					index: data?.target.index ?? 0,
-				}),
-			});
+			createConnection(
+				{
+					source,
+					sourceHandle: createCanvasConnectionHandleString({
+						mode: CanvasConnectionMode.Output,
+						type: isValidNodeConnectionType(data?.source.type)
+							? data?.source.type
+							: NodeConnectionType.Main,
+						index: data?.source.index ?? 0,
+					}),
+					target,
+					targetHandle: createCanvasConnectionHandleString({
+						mode: CanvasConnectionMode.Input,
+						type: isValidNodeConnectionType(data?.target.type)
+							? data?.target.type
+							: NodeConnectionType.Main,
+						index: data?.target.index ?? 0,
+					}),
+				},
+				{ trackHistory },
+			);
+		}
+
+		if (trackBulk && trackHistory) {
+			historyStore.stopRecordingUndo();
 		}
 	}
 
@@ -1373,6 +1443,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		workflowsStore.currentWorkflowExecutions = [];
 
 		// Reset actions
+		uiStore.resetLastInteractedWith();
 		uiStore.removeActiveAction('workflowRunning');
 		uiStore.stateIsDirty = false;
 
@@ -1414,6 +1485,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 	async function addImportedNodesToWorkflow(
 		data: IWorkflowDataUpdate,
+		{ trackBulk = true, trackHistory = false } = {},
 	): Promise<IWorkflowDataUpdate> {
 		// Because nodes with the same name maybe already exist, it could
 		// be needed that they have to be renamed. Also could it be possible
@@ -1464,7 +1536,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 			const localized = i18n.localizeNodeName(node.name, node.type);
 
-			newName = getUniqueNodeName(localized, newNodeNames);
+			newName = uniqueNodeName(localized, Array.from(newNodeNames));
 
 			newNodeNames.add(newName);
 			nodeNameTable[oldName] = newName;
@@ -1554,17 +1626,23 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		}
 
 		// Add the nodes with the changed node names, expressions and connections
-		historyStore.startRecordingUndo();
+		if (trackBulk && trackHistory) {
+			historyStore.startRecordingUndo();
+		}
 
-		await addNodes(Object.values(tempWorkflow.nodes));
+		await addNodes(Object.values(tempWorkflow.nodes), { trackBulk: false, trackHistory });
 		addConnections(
 			mapLegacyConnectionsToCanvasConnections(
 				tempWorkflow.connectionsBySourceNode,
 				Object.values(tempWorkflow.nodes),
 			),
+			{ trackBulk: false, trackHistory },
 		);
 
-		historyStore.stopRecordingUndo();
+		if (trackBulk && trackHistory) {
+			historyStore.stopRecordingUndo();
+		}
+
 		uiStore.stateIsDirty = true;
 
 		return {
@@ -1577,7 +1655,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		workflowData: IWorkflowDataUpdate,
 		source: string,
 		importTags = true,
+		{ trackBulk = true, trackHistory = true } = {},
 	): Promise<IWorkflowDataUpdate> {
+		uiStore.resetLastInteractedWith();
+
 		// If it is JSON check if it looks on the first look like data we can use
 		if (!workflowData.hasOwnProperty('nodes') || !workflowData.hasOwnProperty('connections')) {
 			return {};
@@ -1591,7 +1672,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 					// Provide a new name for nodes that don't have one
 					if (!node.name) {
 						const nodeType = nodeTypesStore.getNodeType(node.type);
-						const newName = getUniqueNodeName(nodeType?.displayName ?? node.type, nodeNames);
+						const newName = uniqueNodeName(
+							nodeType?.displayName ?? node.type,
+							Array.from(nodeNames),
+						);
 						node.name = newName;
 						nodeNames.add(newName);
 					}
@@ -1660,7 +1744,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 				NodeViewUtils.getNewNodePosition(editableWorkflow.value.nodes, lastClickPosition.value),
 			);
 
-			await addImportedNodesToWorkflow(workflowData);
+			await addImportedNodesToWorkflow(workflowData, { trackBulk, trackHistory });
 
 			if (importTags && settingsStore.areTagsEnabled && Array.isArray(workflowData.tags)) {
 				await importWorkflowTags(workflowData);
diff --git a/packages/editor-ui/src/composables/useDocumentTitle.ts b/packages/editor-ui/src/composables/useDocumentTitle.ts
new file mode 100644
index 0000000000..9b0ff97381
--- /dev/null
+++ b/packages/editor-ui/src/composables/useDocumentTitle.ts
@@ -0,0 +1,21 @@
+import { useSettingsStore } from '@/stores/settings.store';
+
+const DEFAULT_TITLE = 'Workflow Automation';
+
+export function useDocumentTitle() {
+	const settingsStore = useSettingsStore();
+	const { releaseChannel } = settingsStore.settings;
+	const suffix =
+		!releaseChannel || releaseChannel === 'stable' ? 'n8n' : `n8n[${releaseChannel.toUpperCase()}]`;
+
+	const set = (title: string) => {
+		const sections = [title || DEFAULT_TITLE, suffix];
+		document.title = sections.join(' - ');
+	};
+
+	const reset = () => {
+		set('');
+	};
+
+	return { set, reset };
+}
diff --git a/packages/editor-ui/src/composables/useExecutionHelpers.ts b/packages/editor-ui/src/composables/useExecutionHelpers.ts
index a65182c475..c87006c92a 100644
--- a/packages/editor-ui/src/composables/useExecutionHelpers.ts
+++ b/packages/editor-ui/src/composables/useExecutionHelpers.ts
@@ -5,6 +5,7 @@ import { useI18n } from '@/composables/useI18n';
 export interface IExecutionUIData {
 	name: string;
 	label: string;
+	createdAt: string;
 	startTime: string;
 	runningTime: string;
 	showTimestamp: boolean;
@@ -17,6 +18,7 @@ export function useExecutionHelpers() {
 	function getUIDetails(execution: ExecutionSummary): IExecutionUIData {
 		const status = {
 			name: 'unknown',
+			createdAt: execution.createdAt?.toString() ?? '',
 			startTime: formatDate(execution.startedAt),
 			label: 'Status unknown',
 			runningTime: '',
diff --git a/packages/editor-ui/src/composables/useKeybindings.spec.ts b/packages/editor-ui/src/composables/useKeybindings.spec.ts
deleted file mode 100644
index b002c95dc0..0000000000
--- a/packages/editor-ui/src/composables/useKeybindings.spec.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useKeybindings } from '@/composables/useKeybindings';
-import { ref } from 'vue';
-
-describe('useKeybindings', () => {
-	it('should call the correct handler for a single key press', async () => {
-		const handler = vi.fn();
-		const keymap = ref({ a: handler });
-
-		useKeybindings(keymap);
-
-		const event = new KeyboardEvent('keydown', { key: 'a' });
-		document.dispatchEvent(event);
-
-		expect(handler).toHaveBeenCalled();
-	});
-
-	it('should call the correct handler for a combination key press', async () => {
-		const handler = vi.fn();
-		const keymap = ref({ 'ctrl+a': handler });
-
-		useKeybindings(keymap);
-
-		const event = new KeyboardEvent('keydown', { key: 'a', ctrlKey: true });
-		document.dispatchEvent(event);
-
-		expect(handler).toHaveBeenCalled();
-	});
-
-	it('should not call handler if key press is ignored', async () => {
-		const handler = vi.fn();
-		const keymap = ref({ a: handler });
-
-		useKeybindings(keymap);
-
-		const input = document.createElement('input');
-		document.body.appendChild(input);
-		input.focus();
-
-		const event = new KeyboardEvent('keydown', { key: 'a' });
-		document.dispatchEvent(event);
-
-		expect(handler).not.toHaveBeenCalled();
-		document.body.removeChild(input);
-	});
-
-	it('should not call handler if disabled', async () => {
-		const handler = vi.fn();
-		const keymap = ref({ a: handler });
-		const disabled = ref(true);
-
-		useKeybindings(keymap, { disabled });
-
-		const event = new KeyboardEvent('keydown', { key: 'a' });
-		document.dispatchEvent(event);
-
-		expect(handler).not.toHaveBeenCalled();
-	});
-
-	it('should normalize shortcut strings correctly', async () => {
-		const handler = vi.fn();
-		const keymap = ref({ 'ctrl+shift+a': handler });
-
-		useKeybindings(keymap);
-
-		const event = new KeyboardEvent('keydown', { key: 'A', ctrlKey: true, shiftKey: true });
-		document.dispatchEvent(event);
-
-		expect(handler).toHaveBeenCalled();
-	});
-
-	it('should normalize shortcut string alternatives correctly', async () => {
-		const handler = vi.fn();
-		const keymap = ref({ 'a|b': handler });
-
-		useKeybindings(keymap);
-
-		const eventA = new KeyboardEvent('keydown', { key: 'A' });
-		document.dispatchEvent(eventA);
-		expect(handler).toHaveBeenCalled();
-
-		const eventB = new KeyboardEvent('keydown', { key: 'B' });
-		document.dispatchEvent(eventB);
-		expect(handler).toHaveBeenCalledTimes(2);
-	});
-});
diff --git a/packages/editor-ui/src/composables/useKeybindings.ts b/packages/editor-ui/src/composables/useKeybindings.ts
index ffee421d84..4aa460c562 100644
--- a/packages/editor-ui/src/composables/useKeybindings.ts
+++ b/packages/editor-ui/src/composables/useKeybindings.ts
@@ -1,12 +1,12 @@
 import { useActiveElement, useEventListener } from '@vueuse/core';
 import { useDeviceSupport } from 'n8n-design-system';
-import type { MaybeRef } from 'vue';
-import { computed, toValue, type MaybeRefOrGetter, unref } from 'vue';
+import type { MaybeRef, Ref } from 'vue';
+import { computed, unref } from 'vue';
 
 type KeyMap = Record<string, (event: KeyboardEvent) => void>;
 
 export const useKeybindings = (
-	keymap: MaybeRefOrGetter<KeyMap>,
+	keymap: Ref<KeyMap>,
 	options?: {
 		disabled: MaybeRef<boolean>;
 	},
@@ -29,7 +29,7 @@ export const useKeybindings = (
 
 	const normalizedKeymap = computed(() =>
 		Object.fromEntries(
-			Object.entries(toValue(keymap))
+			Object.entries(keymap.value)
 				.map(([shortcut, handler]) => {
 					const shortcuts = shortcut.split('|');
 					return shortcuts.map((s) => [normalizeShortcutString(s), handler]);
diff --git a/packages/editor-ui/src/composables/useNodeConnections.ts b/packages/editor-ui/src/composables/useNodeConnections.ts
index 0da4af618d..ffbedad6f9 100644
--- a/packages/editor-ui/src/composables/useNodeConnections.ts
+++ b/packages/editor-ui/src/composables/useNodeConnections.ts
@@ -63,11 +63,10 @@ export function useNodeConnections({
 			connection.targetHandle,
 		);
 
-		const isSameNode = connection.source === connection.target;
 		const isSameMode = sourceMode === targetMode;
 		const isSameType = sourceType === targetType;
 
-		return !isSameNode && !isSameMode && isSameType;
+		return !isSameMode && isSameType;
 	}
 
 	return {
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index 529178e5e5..f2f33a5ef7 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -652,10 +652,10 @@ export function useNodeHelpers() {
 		return returnData;
 	}
 
-	function disableNodes(nodes: INodeUi[], trackHistory = false) {
+	function disableNodes(nodes: INodeUi[], { trackHistory = false, trackBulk = true } = {}) {
 		const telemetry = useTelemetry();
 
-		if (trackHistory) {
+		if (trackHistory && trackBulk) {
 			historyStore.startRecordingUndo();
 		}
 
@@ -690,7 +690,8 @@ export function useNodeHelpers() {
 				);
 			}
 		}
-		if (trackHistory) {
+
+		if (trackHistory && trackBulk) {
 			historyStore.stopRecordingUndo();
 		}
 	}
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index 347fc6d0bb..6e1d993c0e 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -18,7 +18,6 @@ import type { PushMessage, PushPayload } from '@n8n/api-types';
 
 import type { IExecutionResponse, IExecutionsCurrentSummaryExtended } from '@/Interface';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
-import { useTitleChange } from '@/composables/useTitleChange';
 import { useToast } from '@/composables/useToast';
 import { WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
 import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
@@ -43,7 +42,6 @@ type IPushDataExecutionFinishedPayload = PushPayload<'executionFinished'>;
 export function usePushConnection({ router }: { router: ReturnType<typeof useRouter> }) {
 	const workflowHelpers = useWorkflowHelpers({ router });
 	const nodeHelpers = useNodeHelpers();
-	const titleChange = useTitleChange();
 	const toast = useToast();
 	const i18n = useI18n();
 	const telemetry = useTelemetry();
@@ -307,7 +305,6 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 						? saveManualExecutions
 						: workflowSettings.saveManualExecutions;
 
-				let action;
 				if (!isSavingExecutions) {
 					globalLinkActionsEventBus.emit('registerGlobalLinkAction', {
 						key: 'open-settings',
@@ -316,24 +313,12 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 							uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
 						},
 					});
-
-					action =
-						'<a data-action="open-settings">Turn on saving manual executions</a> and run again to see what happened after this node.';
-				} else {
-					action = `<a href="/workflow/${workflow.id}/executions/${activeExecutionId}">View the execution</a> to see what happened after this node.`;
 				}
 
 				// Workflow did start but had been put to wait
-				titleChange.titleSet(workflow.name as string, 'IDLE');
-				toast.showToast({
-					title: 'Workflow started waiting',
-					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,
-				});
+				workflowHelpers.setDocumentTitle(workflow.name as string, 'IDLE');
 			} else if (runDataExecuted.finished !== true) {
-				titleChange.titleSet(workflow.name as string, 'ERROR');
+				workflowHelpers.setDocumentTitle(workflow.name as string, 'ERROR');
 
 				if (
 					runDataExecuted.data.resultData.error?.name === 'ExpressionError' &&
@@ -442,7 +427,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 				}
 			} else {
 				// Workflow did execute without a problem
-				titleChange.titleSet(workflow.name as string, 'IDLE');
+				workflowHelpers.setDocumentTitle(workflow.name as string, 'IDLE');
 
 				const execution = workflowsStore.getWorkflowExecution;
 				if (execution?.executedNode) {
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
index a6caeafc77..81bc65ad38 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -4,6 +4,7 @@ import type {
 	IStartRunData,
 	IWorkflowDb,
 } from '@/Interface';
+
 import type {
 	IRunData,
 	IRunExecutionData,
@@ -13,19 +14,25 @@ import type {
 	StartNodeData,
 	IRun,
 	INode,
+	IDataObject,
 } from 'n8n-workflow';
+
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { useToast } from '@/composables/useToast';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 
-import { CHAT_TRIGGER_NODE_TYPE, WORKFLOW_LM_CHAT_MODAL_KEY } from '@/constants';
-import { useTitleChange } from '@/composables/useTitleChange';
+import {
+	CHAT_TRIGGER_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
+	WAIT_NODE_TYPE,
+	WORKFLOW_LM_CHAT_MODAL_KEY,
+} from '@/constants';
+
 import { useRootStore } from '@/stores/root.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { displayForm } from '@/utils/executionUtils';
+import { displayForm, openPopUpWindow } from '@/utils/executionUtils';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import type { useRouter } from 'vue-router';
@@ -36,16 +43,16 @@ import { useExecutionsStore } from '@/stores/executions.store';
 import type { PushPayload } from '@n8n/api-types';
 import { useLocalStorage } from '@vueuse/core';
 
+const FORM_RELOAD = 'n8n_redirect_to_next_form_test_page';
+
 export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof useRouter> }) {
 	const nodeHelpers = useNodeHelpers();
 	const workflowHelpers = useWorkflowHelpers({ router: useRunWorkflowOpts.router });
 	const i18n = useI18n();
 	const toast = useToast();
-	const { titleSet } = useTitleChange();
 
 	const rootStore = useRootStore();
 	const uiStore = useUIStore();
-	const nodeTypesStore = useNodeTypesStore();
 	const workflowsStore = useWorkflowsStore();
 	const executionsStore = useExecutionsStore();
 
@@ -93,7 +100,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 			return;
 		}
 
-		titleSet(workflow.name as string, 'EXECUTING');
+		workflowHelpers.setDocumentTitle(workflow.name as string, 'EXECUTING');
 
 		toast.clearAllStickyNotifications();
 
@@ -265,42 +272,21 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 
 			const getTestUrl = (() => {
 				return (node: INode) => {
-					const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
-					if (nodeType?.webhooks?.length) {
-						return workflowHelpers.getWebhookUrl(nodeType.webhooks[0], node, 'test');
-					}
-					return '';
+					return `${rootStore.formTestUrl}/${node.parameters.path}`;
 				};
 			})();
 
-			const shouldShowForm = (() => {
-				return (node: INode) => {
-					const workflowTriggerNodes = workflow
-						.getTriggerNodes()
-						.map((triggerNode) => triggerNode.name);
-
-					const showForm =
-						options.destinationNode === node.name ||
-						directParentNodes.includes(node.name) ||
-						workflowTriggerNodes.some((triggerNode) =>
-							workflowsStore.isNodeInOutgoingNodeConnections(triggerNode, node.name),
-						);
-					return showForm;
-				};
-			})();
-
-			displayForm({
-				nodes: workflowData.nodes,
-				runData: workflowsStore.getWorkflowExecution?.data?.resultData?.runData,
-				destinationNode: options.destinationNode,
-				pinData,
-				directParentNodes,
-				formWaitingUrl: rootStore.formWaitingUrl,
-				executionId: runWorkflowApiResponse.executionId,
-				source: options.source,
-				getTestUrl,
-				shouldShowForm,
-			});
+			try {
+				displayForm({
+					nodes: workflowData.nodes,
+					runData: workflowsStore.getWorkflowExecution?.data?.resultData?.runData,
+					destinationNode: options.destinationNode,
+					pinData,
+					directParentNodes,
+					source: options.source,
+					getTestUrl,
+				});
+			} catch (error) {}
 
 			await useExternalHooks().run('workflowRun.runWorkflow', {
 				nodeName: options.destinationNode,
@@ -309,12 +295,135 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 
 			return runWorkflowApiResponse;
 		} catch (error) {
-			titleSet(workflow.name as string, 'ERROR');
+			workflowHelpers.setDocumentTitle(workflow.name as string, 'ERROR');
 			toast.showError(error, i18n.baseText('workflowRun.showError.title'));
 			return undefined;
 		}
 	}
 
+	function getFormResumeUrl(node: INode, executionId: string) {
+		const { webhookSuffix } = (node.parameters.options ?? {}) as IDataObject;
+		const suffix = webhookSuffix && typeof webhookSuffix !== 'object' ? `/${webhookSuffix}` : '';
+		const testUrl = `${rootStore.formWaitingUrl}/${executionId}${suffix}`;
+		return testUrl;
+	}
+
+	async function runWorkflowResolvePending(options: {
+		destinationNode?: string;
+		triggerNode?: string;
+		nodeData?: ITaskData;
+		source?: string;
+	}): Promise<IExecutionPushResponse | undefined> {
+		let runWorkflowApiResponse = await runWorkflow(options);
+		let { executionId } = runWorkflowApiResponse || {};
+
+		const MAX_DELAY = 3000;
+
+		const waitForWebhook = async (): Promise<string> => {
+			return await new Promise<string>((resolve) => {
+				let delay = 300;
+				let timeoutId: NodeJS.Timeout | null = null;
+
+				const checkWebhook = async () => {
+					await useExternalHooks().run('workflowRun.runWorkflow', {
+						nodeName: options.destinationNode,
+						source: options.source,
+					});
+
+					if (workflowsStore.activeExecutionId) {
+						executionId = workflowsStore.activeExecutionId;
+						runWorkflowApiResponse = { executionId };
+
+						if (timeoutId) clearTimeout(timeoutId);
+
+						resolve(executionId);
+					}
+
+					delay = Math.min(delay * 1.1, MAX_DELAY);
+					timeoutId = setTimeout(checkWebhook, delay);
+				};
+				timeoutId = setTimeout(checkWebhook, delay);
+			});
+		};
+
+		if (!executionId) executionId = await waitForWebhook();
+
+		let isFormShown =
+			!options.destinationNode &&
+			workflowsStore.allNodes.some((node) => node.type === FORM_TRIGGER_NODE_TYPE);
+
+		const resolveWaitingNodesData = async (): Promise<void> => {
+			return await new Promise<void>((resolve) => {
+				let delay = 300;
+				let timeoutId: NodeJS.Timeout | null = null;
+
+				const processExecution = async () => {
+					await useExternalHooks().run('workflowRun.runWorkflow', {
+						nodeName: options.destinationNode,
+						source: options.source,
+					});
+					const execution = await workflowsStore.getExecution((executionId as string) || '');
+
+					localStorage.removeItem(FORM_RELOAD);
+
+					if (!execution || workflowsStore.workflowExecutionData === null) {
+						uiStore.removeActiveAction('workflowRunning');
+						if (timeoutId) clearTimeout(timeoutId);
+						resolve();
+						return;
+					}
+
+					if (
+						execution.finished ||
+						['error', 'canceled', 'crashed', 'success'].includes(execution.status)
+					) {
+						workflowsStore.setWorkflowExecutionData(execution);
+						workflowsStore.activeExecutionId = null;
+						if (timeoutId) clearTimeout(timeoutId);
+						resolve();
+						return;
+					}
+
+					if (execution.status === 'waiting' && execution.data?.waitTill) {
+						delete execution.data.resultData.runData[
+							execution.data.resultData.lastNodeExecuted as string
+						];
+						workflowsStore.setWorkflowExecutionRunData(execution.data);
+
+						const { lastNodeExecuted } = execution.data?.resultData || {};
+
+						const waitingNode = execution.workflowData.nodes.find((node) => {
+							return node.name === lastNodeExecuted;
+						});
+
+						if (
+							waitingNode &&
+							waitingNode.type === WAIT_NODE_TYPE &&
+							waitingNode.parameters.resume === 'form'
+						) {
+							const testUrl = getFormResumeUrl(waitingNode, executionId as string);
+
+							if (isFormShown) {
+								localStorage.setItem(FORM_RELOAD, testUrl);
+							} else {
+								isFormShown = true;
+								openPopUpWindow(testUrl);
+							}
+						}
+					}
+
+					delay = Math.min(delay * 1.1, MAX_DELAY);
+					timeoutId = setTimeout(processExecution, delay);
+				};
+				timeoutId = setTimeout(processExecution, delay);
+			});
+		};
+
+		await resolveWaitingNodesData();
+
+		return runWorkflowApiResponse;
+	}
+
 	function consolidateRunDataAndStartNodes(
 		directParentNodes: string[],
 		runData: IRunData | null,
@@ -387,7 +496,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				workflowsStore.executingNode.length = 0;
 				uiStore.removeActiveAction('workflowRunning');
 
-				titleSet(workflowsStore.workflowName, 'IDLE');
+				workflowHelpers.setDocumentTitle(workflowsStore.workflowName, 'IDLE');
 				toast.showMessage({
 					title: i18n.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.title'),
 					message: i18n.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.message'),
@@ -408,7 +517,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 					retryOf: execution.retryOf,
 				};
 				workflowsStore.finishActiveExecution(pushData);
-				titleSet(execution.workflowData.name, 'IDLE');
+				workflowHelpers.setDocumentTitle(execution.workflowData.name, 'IDLE');
 				workflowsStore.executingNode.length = 0;
 				workflowsStore.setWorkflowExecutionData(executedData as IExecutionResponse);
 				uiStore.removeActiveAction('workflowRunning');
@@ -435,6 +544,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 	return {
 		consolidateRunDataAndStartNodes,
 		runWorkflow,
+		runWorkflowResolvePending,
 		runWorkflowApi,
 		stopCurrentExecution,
 		stopWaitingForWebhook,
diff --git a/packages/editor-ui/src/composables/useTitleChange.ts b/packages/editor-ui/src/composables/useTitleChange.ts
deleted file mode 100644
index 7f22cf9e4f..0000000000
--- a/packages/editor-ui/src/composables/useTitleChange.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { WorkflowTitleStatus } from '@/Interface';
-import { useSettingsStore } from '@/stores/settings.store';
-
-export function useTitleChange() {
-	const prependBeta = (title: string) => {
-		const settingsStore = useSettingsStore();
-		const { releaseChannel } = settingsStore.settings;
-		return releaseChannel === 'stable' ? title : `[${releaseChannel.toUpperCase()}] ${title}`;
-	};
-
-	const titleSet = (workflow: string, status: WorkflowTitleStatus) => {
-		let icon = '⚠️';
-		if (status === 'EXECUTING') {
-			icon = '🔄';
-		} else if (status === 'IDLE') {
-			icon = '▶️';
-		}
-
-		window.document.title = prependBeta(`n8n - ${icon} ${workflow}`);
-	};
-
-	const titleReset = () => {
-		window.document.title = prependBeta('n8n - Workflow Automation');
-	};
-
-	return {
-		titleSet,
-		titleReset,
-	};
-}
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index ea0a367de3..1ee8f4a2b4 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -164,7 +164,7 @@ export function useToast() {
 	}
 
 	function causedByCredential(message: string | undefined) {
-		if (!message) return false;
+		if (!message || typeof message !== 'string') return false;
 
 		return message.includes('Credentials for') && message.includes('are not set');
 	}
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
index 77d8abeb14..87492ac545 100644
--- a/packages/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -37,6 +37,7 @@ import type {
 	IWorkflowDataUpdate,
 	IWorkflowDb,
 	TargetItem,
+	WorkflowTitleStatus,
 	XYPosition,
 } from '@/Interface';
 
@@ -57,6 +58,7 @@ import { getSourceItems } from '@/utils/pairedItemUtils';
 import { v4 as uuid } from 'uuid';
 import { useSettingsStore } from '@/stores/settings.store';
 import { getCredentialTypeName, isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useCanvasStore } from '@/stores/canvas.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
@@ -458,6 +460,17 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 	const message = useMessage();
 	const i18n = useI18n();
 	const telemetry = useTelemetry();
+	const documentTitle = useDocumentTitle();
+
+	const setDocumentTitle = (workflowName: string, status: WorkflowTitleStatus) => {
+		let icon = '⚠️';
+		if (status === 'EXECUTING') {
+			icon = '🔄';
+		} else if (status === 'IDLE') {
+			icon = '▶️';
+		}
+		documentTitle.set(`${icon} ${workflowName}`);
+	};
 
 	function getNodeTypesMaxCount() {
 		const nodes = workflowsStore.allNodes;
@@ -681,7 +694,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 		}
 
 		const workflowId = workflowsStore.workflowId;
-		const path = getWebhookExpressionValue(webhookData, 'path', true, node.name);
+		const path = getWebhookExpressionValue(webhookData, 'path', true, node.name) ?? '';
 		const isFullPath =
 			(getWebhookExpressionValue(
 				webhookData,
@@ -1172,6 +1185,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 	}
 
 	return {
+		setDocumentTitle,
 		resolveParameter,
 		resolveRequiredParameters,
 		getCurrentWorkflow,
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index c6acae7916..521c481e9e 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -69,9 +69,9 @@ 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';
-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_PLUS_ENROLLMENT_MODAL = 'communityPlusEnrollment';
 
 export const COMMUNITY_PACKAGE_MANAGE_ACTIONS = {
 	UNINSTALL: 'uninstall',
@@ -525,6 +525,7 @@ export const MAPPING_PARAMS = [
 	'$input',
 	'$item',
 	'$jmespath',
+	'$fromAI',
 	'$json',
 	'$node',
 	'$now',
@@ -667,13 +668,6 @@ export const KEEP_AUTH_IN_NDV_FOR_NODES = [
 export const MAIN_AUTH_FIELD_NAME = 'authentication';
 export const NODE_RESOURCE_FIELD_NAME = 'resource';
 
-export const ASK_AI_EXPERIMENT = {
-	name: '011_ask_AI',
-	control: 'control',
-	gpt3: 'gpt3',
-	gpt4: 'gpt4',
-};
-
 export const TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT = '017_template_credential_setup_v2';
 
 export const CANVAS_AUTO_ADD_MANUAL_TRIGGER_EXPERIMENT = {
@@ -694,14 +688,12 @@ export const MORE_ONBOARDING_OPTIONS_EXPERIMENT = {
 	variant: 'variant',
 };
 
-export const EXECUTION_ANNOTATION_EXPERIMENT = '023_execution_annotation';
 export const CREDENTIAL_DOCS_EXPERIMENT = {
 	name: '024_credential_docs',
 	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,
@@ -722,7 +714,11 @@ export const MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH = 6;
 
 export const MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH = 36;
 
-export const NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND = [FILTER_NODE_TYPE, SWITCH_NODE_TYPE];
+export const NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND = [
+	FILTER_NODE_TYPE,
+	SWITCH_NODE_TYPE,
+	REMOVE_DUPLICATES_NODE_TYPE,
+];
 
 type ClearOutgoingConnectonsEvents = {
 	[nodeName: string]: {
diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index 30721aa209..b137d3eb0d 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -1,5 +1,4 @@
 import { createApp } from 'vue';
-import * as Sentry from '@sentry/vue';
 
 import '@vue-flow/core/dist/style.css';
 import '@vue-flow/core/dist/theme-default.css';
@@ -30,16 +29,13 @@ import { FontAwesomePlugin } from './plugins/icons';
 import { createPinia, PiniaVuePlugin } from 'pinia';
 import { JsPlumbPlugin } from '@/plugins/jsplumb';
 import { ChartJSPlugin } from '@/plugins/chartjs';
+import { SentryPlugin } from '@/plugins/sentry';
 
 const pinia = createPinia();
 
 const app = createApp(App);
 
-if (window.sentry?.dsn) {
-	const { dsn, release, environment } = window.sentry;
-	Sentry.init({ app, dsn, release, environment });
-}
-
+app.use(SentryPlugin);
 app.use(TelemetryPlugin);
 app.use(PiniaVuePlugin);
 app.use(I18nPlugin);
diff --git a/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts b/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts
index 9a6fcd4206..dec983fa9b 100644
--- a/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts
+++ b/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts
@@ -38,9 +38,11 @@ describe('telemetry', () => {
 
 			telemetry.identify(userId, instanceId);
 			expect(identifyFunction).toHaveBeenCalledTimes(1);
-			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
-				instance_id: instanceId,
-			});
+			expect(identifyFunction).toHaveBeenCalledWith(
+				`${instanceId}#${userId}`,
+				{ instance_id: instanceId },
+				{ context: { ip: '0.0.0.0' } },
+			);
 		});
 
 		it('Rudderstack identify method should be called when proving userId and versionCli ', () => {
@@ -60,10 +62,14 @@ describe('telemetry', () => {
 
 			telemetry.identify(userId, instanceId, versionCli);
 			expect(identifyFunction).toHaveBeenCalledTimes(1);
-			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
-				instance_id: instanceId,
-				version_cli: versionCli,
-			});
+			expect(identifyFunction).toHaveBeenCalledWith(
+				`${instanceId}#${userId}`,
+				{
+					instance_id: instanceId,
+					version_cli: versionCli,
+				},
+				{ context: { ip: '0.0.0.0' } },
+			);
 		});
 
 		it('Rudderstack identify method should be called when proving userId and versionCli and projectId', () => {
@@ -84,10 +90,14 @@ describe('telemetry', () => {
 
 			telemetry.identify(userId, instanceId, versionCli, projectId);
 			expect(identifyFunction).toHaveBeenCalledTimes(1);
-			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}#${projectId}`, {
-				instance_id: instanceId,
-				version_cli: versionCli,
-			});
+			expect(identifyFunction).toHaveBeenCalledWith(
+				`${instanceId}#${userId}#${projectId}`,
+				{
+					instance_id: instanceId,
+					version_cli: versionCli,
+				},
+				{ context: { ip: '0.0.0.0' } },
+			);
 		});
 
 		it('Rudderstack identify method should be called when proving userId and deployment type is cloud ', () => {
@@ -111,11 +121,15 @@ describe('telemetry', () => {
 
 			telemetry.identify(userId, instanceId, versionCli);
 			expect(identifyFunction).toHaveBeenCalledTimes(1);
-			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
-				instance_id: instanceId,
-				version_cli: versionCli,
-				user_cloud_id: userCloudId,
-			});
+			expect(identifyFunction).toHaveBeenCalledWith(
+				`${instanceId}#${userId}`,
+				{
+					instance_id: instanceId,
+					version_cli: versionCli,
+					user_cloud_id: userCloudId,
+				},
+				{ context: { ip: '0.0.0.0' } },
+			);
 		});
 
 		it('Rudderstack identify method should be called when proving userId and deployment type is cloud', () => {
@@ -139,11 +153,15 @@ describe('telemetry', () => {
 
 			telemetry.identify(userId, instanceId, versionCli);
 			expect(identifyFunction).toHaveBeenCalledTimes(1);
-			expect(identifyFunction).toHaveBeenCalledWith(`${instanceId}#${userId}`, {
-				instance_id: instanceId,
-				version_cli: versionCli,
-				user_cloud_id: userCloudId,
-			});
+			expect(identifyFunction).toHaveBeenCalledWith(
+				`${instanceId}#${userId}`,
+				{
+					instance_id: instanceId,
+					version_cli: versionCli,
+					user_cloud_id: userCloudId,
+				},
+				{ context: { ip: '0.0.0.0' } },
+			);
 		});
 
 		it('Rudderstack reset method should be called when proving userId and deployment type is cloud', () => {
@@ -175,10 +193,14 @@ describe('telemetry', () => {
 			telemetry.track(event, properties, options);
 
 			expect(trackFunction).toHaveBeenCalledTimes(1);
-			expect(trackFunction).toHaveBeenCalledWith(event, {
-				...properties,
-				version_cli: MOCK_VERSION_CLI,
-			});
+			expect(trackFunction).toHaveBeenCalledWith(
+				event,
+				{
+					...properties,
+					version_cli: MOCK_VERSION_CLI,
+				},
+				{ context: { ip: '0.0.0.0' } },
+			);
 		});
 	});
 });
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
index cce673e48b..bed05f2c31 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
@@ -75,7 +75,7 @@ describe('Top-level completions', () => {
 				section: METADATA_SECTION,
 			}),
 		);
-		expect(result?.[14]).toEqual(
+		expect(result?.[15]).toEqual(
 			expect.objectContaining({ label: '$max()', section: METHODS_SECTION }),
 		);
 	});
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/utils.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/utils.test.ts
index c71b15a87f..7fb6e8ea8b 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/utils.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/utils.test.ts
@@ -1,5 +1,16 @@
-import { expressionWithFirstItem } from '../utils';
+import { createTestNode, createTestWorkflowObject } from '@/__tests__/mocks';
+import * as workflowHelpers from '@/composables/useWorkflowHelpers';
 import { javascriptLanguage } from '@codemirror/lang-javascript';
+import { autocompletableNodeNames, expressionWithFirstItem } from '../utils';
+import type { MockInstance } from 'vitest';
+import * as ndvStore from '@/stores/ndv.store';
+import { NodeConnectionType, type IConnections } from 'n8n-workflow';
+
+vi.mock('@/composables/useWorkflowHelpers', () => ({
+	useWorkflowHelpers: vi.fn().mockReturnValue({
+		getCurrentWorkflow: vi.fn(),
+	}),
+}));
 
 describe('completion utils', () => {
 	describe('expressionWithFirstItem', () => {
@@ -43,4 +54,72 @@ describe('completion utils', () => {
 			expect(result).toBe(expected);
 		});
 	});
+
+	describe('autocompletableNodeNames', () => {
+		it('should work for normal nodes', () => {
+			const nodes = [
+				createTestNode({ name: 'Node 1' }),
+				createTestNode({ name: 'Node 2' }),
+				createTestNode({ name: 'Node 3' }),
+			];
+			const connections = {
+				[nodes[0].name]: {
+					[NodeConnectionType.Main]: [
+						[{ node: nodes[1].name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+				[nodes[1].name]: {
+					[NodeConnectionType.Main]: [
+						[{ node: nodes[2].name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+			const workflowObject = createTestWorkflowObject({
+				nodes,
+				connections,
+			});
+
+			const workflowHelpersMock: MockInstance = vi.spyOn(workflowHelpers, 'useWorkflowHelpers');
+			workflowHelpersMock.mockReturnValue({
+				getCurrentWorkflow: vi.fn(() => workflowObject),
+			});
+			const ndvStoreMock: MockInstance = vi.spyOn(ndvStore, 'useNDVStore');
+			ndvStoreMock.mockReturnValue({ activeNode: nodes[2] });
+
+			expect(autocompletableNodeNames()).toEqual(['Node 2', 'Node 1']);
+		});
+
+		it('should work for AI tool nodes', () => {
+			const nodes = [
+				createTestNode({ name: 'Normal Node' }),
+				createTestNode({ name: 'Agent' }),
+				createTestNode({ name: 'Tool' }),
+			];
+			const connections: IConnections = {
+				[nodes[0].name]: {
+					[NodeConnectionType.Main]: [
+						[{ node: nodes[1].name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+				[nodes[2].name]: {
+					[NodeConnectionType.AiMemory]: [
+						[{ node: nodes[1].name, type: NodeConnectionType.AiMemory, index: 0 }],
+					],
+				},
+			};
+			const workflowObject = createTestWorkflowObject({
+				nodes,
+				connections,
+			});
+
+			const workflowHelpersMock: MockInstance = vi.spyOn(workflowHelpers, 'useWorkflowHelpers');
+			workflowHelpersMock.mockReturnValue({
+				getCurrentWorkflow: vi.fn(() => workflowObject),
+			});
+			const ndvStoreMock: MockInstance = vi.spyOn(ndvStore, 'useNDVStore');
+			ndvStoreMock.mockReturnValue({ activeNode: nodes[2] });
+
+			expect(autocompletableNodeNames()).toEqual(['Normal Node']);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/constants.ts b/packages/editor-ui/src/plugins/codemirror/completions/constants.ts
index 7d01899b24..3cc673147d 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/constants.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/constants.ts
@@ -276,6 +276,58 @@ export const ROOT_DOLLAR_COMPLETIONS: Completion[] = [
 			true,
 		),
 	},
+	{
+		label: '$fromAI()',
+		section: METHODS_SECTION,
+		info: createInfoBoxRenderer(
+			{
+				name: '$fromAI',
+				returnType: 'any',
+				description: 'Populate this with the parameter passed from the large language model',
+				args: [
+					{
+						name: 'key',
+						description:
+							'The key or name of the argument, must be between 1 and 64 characters long and only contain lowercase letters, uppercase letters, numbers, underscores, and hyphens',
+						type: 'string',
+					},
+					{
+						name: 'description',
+						description: 'Description of the argument',
+						type: 'string',
+						optional: true,
+					},
+					{
+						name: 'type',
+						description: 'Type of the argument',
+						type: 'string | number | boolean | json',
+						optional: true,
+					},
+					{
+						name: 'defaultValue',
+						description: 'Default value for the argument',
+						type: 'any',
+						optional: true,
+					},
+				],
+				examples: [
+					{
+						example: '$fromAI("name")',
+						description: 'Get the name of the person',
+					},
+					{
+						example: '$fromAI("age", "The age of the person", "number", 18)',
+						description: 'Get the age of the person as number with default value 18',
+					},
+					{
+						example: '$fromAI("isStudent", "Is the person a student", "boolean", false)',
+						description: 'Get the student status of the person as boolean with default value false',
+					},
+				],
+			},
+			true,
+		),
+	},
 	{
 		label: '$max()',
 		section: METHODS_SECTION,
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
index 0286405b1a..6d4ee5c56d 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
@@ -208,15 +208,29 @@ export const isSplitInBatchesAbsent = () =>
 	!useWorkflowsStore().workflow.nodes.some((node) => node.type === SPLIT_IN_BATCHES_NODE_TYPE);
 
 export function autocompletableNodeNames() {
-	const activeNodeName = useNDVStore().activeNode?.name;
+	const activeNode = useNDVStore().activeNode;
 
-	if (!activeNodeName) return [];
+	if (!activeNode) return [];
 
-	return useWorkflowHelpers({ router: useRouter() })
-		.getCurrentWorkflow()
-		.getParentNodesByDepth(activeNodeName)
+	const activeNodeName = activeNode.name;
+
+	const workflow = useWorkflowHelpers({ router: useRouter() }).getCurrentWorkflow();
+	const nonMainChildren = workflow.getChildNodes(activeNodeName, 'ALL_NON_MAIN');
+
+	// This is a tool node, look for the nearest node with main connections
+	if (nonMainChildren.length > 0) {
+		return nonMainChildren.map(getPreviousNodes).flat();
+	}
+
+	return getPreviousNodes(activeNodeName);
+}
+
+export function getPreviousNodes(nodeName: string) {
+	const workflow = useWorkflowHelpers({ router: useRouter() }).getCurrentWorkflow();
+	return workflow
+		.getParentNodesByDepth(nodeName)
 		.map((node) => node.name)
-		.filter((name) => name !== activeNodeName);
+		.filter((name) => name !== nodeName);
 }
 
 /**
diff --git a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts b/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
index 6bbe3dcf42..22263fd35a 100644
--- a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
+++ b/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
@@ -3,6 +3,7 @@ import { EditorView, Decoration } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
 import { tags } from '@lezer/highlight';
 import { syntaxHighlighting, HighlightStyle } from '@codemirror/language';
+import { captureException } from '@sentry/vue';
 
 import type {
 	ColoringStateEffect,
@@ -87,7 +88,7 @@ const coloringStateField = StateField.define<DecorationSet>({
 				}
 			}
 		} catch (error) {
-			window?.Sentry?.captureException(error);
+			captureException(error);
 		}
 
 		return colorings;
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index d007b41da1..26c21a3dcc 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -150,6 +150,10 @@
 	"aiAssistant.codeUpdated.message.body2": "node to see the changes",
 	"aiAssistant.thinkingSteps.analyzingError": "Analyzing the error...",
 	"aiAssistant.thinkingSteps.thinking": "Thinking...",
+	"aiAssistant.prompts.currentView.workflowList": "The user is currently looking at the list of workflows.",
+	"aiAssistant.prompts.currentView.credentialsList": "The user is currently looking at the list of credentials.",
+	"aiAssistant.prompts.currentView.executionsView": "The user is currently looking at the list of executions for the currently open workflow.",
+	"aiAssistant.prompts.currentView.workflowEditor": "The user is currently looking at the current workflow in n8n editor, without any specific node selected.",
 	"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",
@@ -658,6 +662,7 @@
 	"executionDetails.executionWaiting": "Execution waiting",
 	"executionDetails.executionWasSuccessful": "Execution was successful",
 	"executionDetails.of": "of",
+	"executionDetails.at": "at",
 	"executionDetails.newMessage": "Execution waiting in the queue.",
 	"executionDetails.openWorkflow": "Open Workflow",
 	"executionDetails.readOnly.readOnly": "Read only",
@@ -666,6 +671,7 @@
 	"executionDetails.runningTimeFinished": "in {time}",
 	"executionDetails.runningTimeRunning": "for",
 	"executionDetails.runningMessage": "Execution is running. It will show here once finished.",
+	"executionDetails.startingSoon": "Starting soon",
 	"executionDetails.workflow": "workflow",
 	"executionsLandingPage.emptyState.noTrigger.heading": "Set up the first step. Then execute your workflow",
 	"executionsLandingPage.emptyState.noTrigger.buttonText": "Add first step...",
@@ -730,6 +736,7 @@
 	"executionsList.showMessage.stopExecution.message": "Execution ID {activeExecutionId}",
 	"executionsList.showMessage.stopExecution.title": "Execution stopped",
 	"executionsList.startedAt": "Started At",
+	"executionsList.startingSoon": "Starting soon",
 	"executionsList.started": "{date} at {time}",
 	"executionsList.id": "Execution ID",
 	"executionsList.status": "Status",
@@ -958,6 +965,10 @@
 	"ndv.output.run": "Run",
 	"ndv.output.runNodeHint": "Execute this node to view data",
 	"ndv.output.runNodeHintSubNode": "Output will appear here once the parent node is run",
+	"ndv.output.waitNodeWaitingForWebhook": "Execution will continue when webhook is received on ",
+	"ndv.output.sendAndWaitWaitingApproval": "Execution will continue after the user's response",
+	"ndv.output.waitNodeWaitingForFormSubmission": "Execution will continue when form is submitted on ",
+	"ndv.output.waitNodeWaiting": "Execution will continue when wait time is over",
 	"ndv.output.insertTestData": "set mock data",
 	"ndv.output.staleDataWarning.regular": "Node parameters have changed.<br>Test node again to refresh output.",
 	"ndv.output.staleDataWarning.pinData": "Node parameter changes will not affect pinned output data.",
@@ -1004,6 +1015,9 @@
 	"node.nodeIsExecuting": "Node is executing",
 	"node.nodeIsWaitingTill": "Node is waiting until {date} {time}",
 	"node.theNodeIsWaitingIndefinitelyForAnIncomingWebhookCall": "The node is waiting for an incoming webhook call (indefinitely)",
+	"node.theNodeIsWaitingWebhookCall": "The node is waiting for an incoming webhook call",
+	"node.theNodeIsWaitingFormCall": "The node is waiting for a form submission",
+	"node.theNodeIsWaitingUserInput": "The node is waiting for user input",
 	"node.waitingForYouToCreateAnEventIn": "Waiting for you to create an event in {nodeType}",
 	"node.discovery.pinData.canvas": "You can pin this output instead of waiting for a test event. Open node to do so.",
 	"node.discovery.pinData.ndv": "You can pin this output instead of waiting for a test event.",
@@ -1361,6 +1375,7 @@
 	"parameterInput.loadingOptions": "Loading options...",
 	"parameterInput.loadOptionsErrorService": "Error fetching options from {service}",
 	"parameterInput.loadOptionsError": "Error fetching options",
+	"parameterInput.loadOptionsCredentialsRequired": "Set up credential to see options",
 	"parameterInput.openEditWindow": "Open Edit Window",
 	"parameterInput.parameter": "Parameter: \"{shortPath}\"",
 	"parameterInput.parameterHasExpression": "Parameter: \"{shortPath}\" has an expression",
@@ -1765,7 +1780,6 @@
 	"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",
 	"settings.api.view.tryapi": "Try it out using the",
 	"settings.api.view.more-details": "You can find more details in",
 	"settings.api.view.external-docs": "the API documentation",
@@ -1774,6 +1788,8 @@
 	"settings.usageAndPlan.title": "Usage and plan",
 	"settings.usageAndPlan.description": "You’re on the {name} {type}",
 	"settings.usageAndPlan.plan": "Plan",
+	"settings.usageAndPlan.callOut": "{link} selected paid features for free (forever)",
+	"settings.usageAndPlan.callOut.link": "Unlock",
 	"settings.usageAndPlan.edition": "Edition",
 	"settings.usageAndPlan.error": "@:_reusableBaseText.error",
 	"settings.usageAndPlan.activeWorkflows": "Active workflows",
@@ -1790,6 +1806,7 @@
 	"settings.usageAndPlan.license.activation.error.title": "Activation failed",
 	"settings.usageAndPlan.license.activation.success.title": "License activated",
 	"settings.usageAndPlan.license.activation.success.message": "Your {name} {type} has been successfully activated.",
+	"settings.usageAndPlan.license.communityRegistered.tooltip": "You have registered your email to unlock additional features on your community plan",
 	"settings.externalSecrets.title": "External Secrets",
 	"settings.externalSecrets.info": "Connect external secrets tools for centralized credentials management across environments, and to enhance system security.",
 	"settings.externalSecrets.info.link": "More info",
@@ -2501,17 +2518,20 @@
 	"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}",
 	"projects.create.limitReached.link": "View plans",
-	"projects.move.resource.modal.title": "Choose a project to move this {resourceTypeLabel} to",
-	"projects.move.resource.modal.message": "\"{resourceName}\" is currently in the \"{resourceHomeProjectName}\" project. Which project would you like to move this {resourceTypeLabel} to?",
-	"projects.move.resource.confirm.modal.title": "Please confirm the following",
-	"projects.move.resource.confirm.modal.button.confirm": "Confirm move to new project",
-	"projects.move.workflow.confirm.modal.label": "This workflow may stop working if the credentials used with it do not exist in the project its being moved to",
-	"projects.move.credential.confirm.modal.label": "Any workflows currently using this credential will stop working once this credential has been moved",
-	"projects.move.resource.confirm.modal.label": "Any individual sharing currently associated with this {resourceTypeLabel} will be removed. (currently shared with {numberOfUsers})",
-	"projects.move.resource.confirm.modal.numberOfUsers": "{numberOfUsers} user | {numberOfUsers} users",
+	"projects.move.resource.modal.title": "Choose a project or user to move this {resourceTypeLabel} to",
+	"projects.move.resource.modal.message": "\"{resourceName}\" is currently {inPersonalProject}{inTeamProject}",
+	"projects.move.resource.modal.message.team": "in the \"{resourceHomeProjectName}\" project.",
+	"projects.move.resource.modal.message.personal": "owned by \"{resourceHomeProjectName}\".",
+	"projects.move.resource.modal.message.note": "Note",
+	"projects.move.resource.modal.message.sharingNote": "{note}: Moving will remove any existing sharing for this {resourceTypeLabel}.",
+	"projects.move.resource.modal.message.sharingInfo": "(Currently shared with {numberOfProjects} project) | (Currently shared with {numberOfProjects} projects)",
+	"projects.move.resource.modal.message.noProjects": "Currently there are not any projects or users available for you to move this {resourceTypeLabel} to.",
+	"projects.move.resource.modal.button": "Move {resourceTypeLabel}",
+	"projects.move.resource.modal.selectPlaceholder": "Select project or user...",
 	"projects.move.resource.error.title": "Error moving {resourceName} {resourceTypeLabel}",
 	"projects.move.resource.success.title": "Successfully moved {resourceTypeLabel}",
-	"projects.move.resource.success.message": "{resourceName} {resourceTypeLabel} was moved to {targetProjectName} {link}",
+	"projects.move.resource.success.message": "{resourceName} {resourceTypeLabel} was moved to {targetProjectName}. {workflow} {link}",
+	"projects.move.resource.success.message.workflow": "Please double check any credentials this workflow is using are also shared with {targetProjectName}.",
 	"projects.move.resource.success.link": "View {targetProjectName}",
 	"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",
@@ -2642,5 +2662,20 @@
 	"becomeCreator.closeButtonTitle": "Close",
 	"feedback.title": "Was this helpful?",
 	"feedback.positive": "I found this helpful",
-	"feedback.negative": "I didn't find this helpful"
+	"feedback.negative": "I didn't find this helpful",
+	"communityPlusModal.badge": "Time limited offer",
+	"communityPlusModal.title": "Get paid features for free (forever)",
+	"communityPlusModal.error.title": "License request failed",
+	"communityPlusModal.success.title": "Request sent",
+	"communityPlusModal.success.message": "License key will be sent to {email}",
+	"communityPlusModal.description": "Receive a free activation key for the advanced features below - lifetime access.",
+	"communityPlusModal.features.first.title": "Workflow history",
+	"communityPlusModal.features.first.description": "Review and restore any workflow version from the last 24 hours",
+	"communityPlusModal.features.second.title": "Advanced debugging",
+	"communityPlusModal.features.second.description": "Easily fix any workflow execution that’s errored, then re-run it",
+	"communityPlusModal.features.third.title": "Execution search and tagging",
+	"communityPlusModal.features.third.description": "Search and organize past workflow executions for easier review",
+	"communityPlusModal.input.email.label": "Enter email to receive your license key",
+	"communityPlusModal.button.skip": "Skip",
+	"communityPlusModal.button.confirm": "Send me a free license key"
 }
diff --git a/packages/editor-ui/src/plugins/sentry.spec.ts b/packages/editor-ui/src/plugins/sentry.spec.ts
new file mode 100644
index 0000000000..b8425647a2
--- /dev/null
+++ b/packages/editor-ui/src/plugins/sentry.spec.ts
@@ -0,0 +1,46 @@
+import type * as Sentry from '@sentry/vue';
+import { beforeSend } from '@/plugins/sentry';
+import { AxiosError } from 'axios';
+import { ResponseError } from '@/utils/apiUtils';
+
+function createErrorEvent(): Sentry.ErrorEvent {
+	return {} as Sentry.ErrorEvent;
+}
+
+describe('beforeSend', () => {
+	it('should return null when originalException is undefined', () => {
+		const event = createErrorEvent();
+		const hint = { originalException: undefined };
+		expect(beforeSend(event, hint)).toBeNull();
+	});
+
+	it('should return null when originalException matches ignoredErrors by instance and message', () => {
+		const event = createErrorEvent();
+		const hint = { originalException: new ResponseError("Can't connect to n8n.") };
+		expect(beforeSend(event, hint)).toBeNull();
+	});
+
+	it('should return null when originalException matches ignoredErrors by instance and message regex', () => {
+		const event = createErrorEvent();
+		const hint = { originalException: new ResponseError('ECONNREFUSED') };
+		expect(beforeSend(event, hint)).toBeNull();
+	});
+
+	it('should return null when originalException matches ignoredErrors by instance only', () => {
+		const event = createErrorEvent();
+		const hint = { originalException: new AxiosError() };
+		expect(beforeSend(event, hint)).toBeNull();
+	});
+
+	it('should return null when originalException matches ignoredErrors by instance and message regex (ResizeObserver)', () => {
+		const event = createErrorEvent();
+		const hint = { originalException: new Error('ResizeObserver loop limit exceeded') };
+		expect(beforeSend(event, hint)).toBeNull();
+	});
+
+	it('should return event when originalException does not match any ignoredErrors', () => {
+		const event = createErrorEvent();
+		const hint = { originalException: new Error('Some other error') };
+		expect(beforeSend(event, hint)).toEqual(event);
+	});
+});
diff --git a/packages/editor-ui/src/plugins/sentry.ts b/packages/editor-ui/src/plugins/sentry.ts
new file mode 100644
index 0000000000..c00826a092
--- /dev/null
+++ b/packages/editor-ui/src/plugins/sentry.ts
@@ -0,0 +1,59 @@
+import type { Plugin } from 'vue';
+import { AxiosError } from 'axios';
+import { ResponseError } from '@/utils/apiUtils';
+import * as Sentry from '@sentry/vue';
+
+const ignoredErrors = [
+	{ instanceof: AxiosError },
+	{ instanceof: ResponseError, message: /ECONNREFUSED/ },
+	{ instanceof: ResponseError, message: "Can't connect to n8n." },
+	{ instanceof: Error, message: /ResizeObserver/ },
+] as const;
+
+export function beforeSend(event: Sentry.ErrorEvent, { originalException }: Sentry.EventHint) {
+	if (
+		!originalException ||
+		ignoredErrors.some((entry) => {
+			const typeMatch = originalException instanceof entry.instanceof;
+			if (!typeMatch) {
+				return false;
+			}
+
+			if ('message' in entry) {
+				if (entry.message instanceof RegExp) {
+					return entry.message.test(originalException.message ?? '');
+				} else {
+					return originalException.message === entry.message;
+				}
+			}
+
+			return true;
+		})
+	) {
+		return null;
+	}
+
+	return event;
+}
+
+export const SentryPlugin: Plugin = {
+	install: (app) => {
+		if (!window.sentry?.dsn) {
+			return;
+		}
+
+		const { dsn, release, environment, serverName } = window.sentry;
+
+		Sentry.init({
+			app,
+			dsn,
+			release,
+			environment,
+			beforeSend,
+		});
+
+		if (serverName) {
+			Sentry.setTag('server_name', serverName);
+		}
+	},
+};
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index 5bef0920f8..7c14fc9933 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -94,6 +94,12 @@ export class Telemetry {
 			this.rudderStack?.identify(
 				`${instanceId}#${userId}${projectId ? '#' + projectId : ''}`,
 				traits,
+				{
+					context: {
+						// provide a fake IP address to instruct RudderStack to not use the user's IP address
+						ip: '0.0.0.0',
+					},
+				},
 			);
 		} else {
 			this.rudderStack?.reset();
@@ -112,7 +118,12 @@ export class Telemetry {
 			version_cli: useRootStore().versionCli,
 		};
 
-		this.rudderStack.track(event, updatedProperties);
+		this.rudderStack.track(event, updatedProperties, {
+			context: {
+				// provide a fake IP address to instruct RudderStack to not use the user's IP address
+				ip: '0.0.0.0',
+			},
+		});
 
 		if (options.withPostHog) {
 			usePostHog().capture(event, updatedProperties);
@@ -136,7 +147,12 @@ export class Telemetry {
 			properties.theme = useUIStore().appliedTheme;
 
 			const category = route.meta?.telemetry?.pageCategory || 'Editor';
-			this.rudderStack.page(category, pageName, properties);
+			this.rudderStack.page(category, pageName, properties, {
+				context: {
+					// provide a fake IP address to instruct RudderStack to not use the user's IP address
+					ip: '0.0.0.0',
+				},
+			});
 		} else {
 			this.pageEventQueue.push({
 				route,
diff --git a/packages/editor-ui/src/routes/projects.routes.ts b/packages/editor-ui/src/routes/projects.routes.ts
index 09c13311cc..6d32b88441 100644
--- a/packages/editor-ui/src/routes/projects.routes.ts
+++ b/packages/editor-ui/src/routes/projects.routes.ts
@@ -18,7 +18,8 @@ const commonChildRoutes: RouteRecordRaw[] = [
 		},
 	},
 	{
-		path: 'credentials',
+		path: 'credentials/:credentialId?',
+		props: true,
 		components: {
 			default: CredentialsView,
 			sidebar: MainSidebar,
diff --git a/packages/editor-ui/src/shims.d.ts b/packages/editor-ui/src/shims.d.ts
index 83cd8850cd..30b8303cd8 100644
--- a/packages/editor-ui/src/shims.d.ts
+++ b/packages/editor-ui/src/shims.d.ts
@@ -18,7 +18,7 @@ declare global {
 	interface Window {
 		BASE_PATH: string;
 		REST_ENDPOINT: string;
-		sentry?: { dsn?: string; environment: string; release: string };
+		sentry?: { dsn?: string; environment: string; release: string; serverName?: string };
 		n8nExternalHooks?: PartialDeep<ExternalHooks>;
 		preventNodeViewBeforeUnload?: boolean;
 		maxPinnedDataSize?: number;
diff --git a/packages/editor-ui/src/stores/__tests__/assistant.store.test.ts b/packages/editor-ui/src/stores/__tests__/assistant.store.test.ts
index bd83d16f1c..760176321e 100644
--- a/packages/editor-ui/src/stores/__tests__/assistant.store.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/assistant.store.test.ts
@@ -15,7 +15,7 @@ import { merge } from 'lodash-es';
 import { DEFAULT_POSTHOG_SETTINGS } from './posthog.test';
 import { AI_ASSISTANT_EXPERIMENT, VIEWS } from '@/constants';
 import { reactive } from 'vue';
-import * as chatAPI from '@/api/assistant';
+import * as chatAPI from '@/api/ai';
 import * as telemetryModule from '@/composables/useTelemetry';
 import type { Telemetry } from '@/plugins/telemetry';
 
diff --git a/packages/editor-ui/src/stores/assistant.store.ts b/packages/editor-ui/src/stores/assistant.store.ts
index bb28382088..c3f8c77e00 100644
--- a/packages/editor-ui/src/stores/assistant.store.ts
+++ b/packages/editor-ui/src/stores/assistant.store.ts
@@ -1,10 +1,11 @@
-import { chatWithAssistant, replaceCode } from '@/api/assistant';
+import { chatWithAssistant, replaceCode } from '@/api/ai';
 import {
 	VIEWS,
 	EDITABLE_CANVAS_VIEWS,
 	STORES,
 	AI_ASSISTANT_EXPERIMENT,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
+	CREDENTIAL_EDIT_MODAL_KEY,
 } from '@/constants';
 import type { ChatRequest } from '@/types/assistant.types';
 import type { ChatUI } from 'n8n-design-system/types/assistant';
@@ -17,26 +18,19 @@ import { useRoute } from 'vue-router';
 import { useSettingsStore } from './settings.store';
 import { assert } from '@/utils/assert';
 import { useWorkflowsStore } from './workflows.store';
-import type { IDataObject, ICredentialType, INodeParameters } from 'n8n-workflow';
+import type { ICredentialType, INodeParameters, NodeError, INode } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 import { ndvEventBus, codeNodeEditorEventBus } from '@/event-bus';
 import { useNDVStore } from './ndv.store';
 import type { IUpdateInformation } from '@/Interface';
-import {
-	getMainAuthField,
-	getNodeAuthOptions,
-	getReferencedNodes,
-	getNodesSchemas,
-	processNodeForAssistant,
-	isNodeReferencingInputData,
-} 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';
 import { useUIStore } from './ui.store';
 import AiUpdatedCodeMessage from '@/components/AiUpdatedCodeMessage.vue';
+import { useCredentialsStore } from './credentials.store';
+import { useAIAssistantHelpers } from '@/composables/useAIAssistantHelpers';
 
 export const MAX_CHAT_WIDTH = 425;
 export const MIN_CHAT_WIDTH = 250;
@@ -69,6 +63,7 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 	const { getVariant } = usePostHog();
 	const locale = useI18n();
 	const telemetry = useTelemetry();
+	const assistantHelpers = useAIAssistantHelpers();
 
 	const suggestions = ref<{
 		[suggestionId: string]: {
@@ -88,6 +83,9 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 	// We use streaming for assistants that support it, and this for agents
 	const assistantThinkingMessage = ref<string | undefined>();
 	const chatSessionTask = ref<'error' | 'support' | 'credentials' | undefined>();
+	// Indicate if last sent workflow and execution data is stale
+	const workflowDataStale = ref<boolean>(true);
+	const workflowExecutionDataStale = ref<boolean>(true);
 
 	const isExperimentEnabled = computed(
 		() => getVariant(AI_ASSISTANT_EXPERIMENT.name) === AI_ASSISTANT_EXPERIMENT.variant,
@@ -129,18 +127,6 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 			).length,
 	);
 
-	watch(route, () => {
-		const activeWorkflowId = workflowsStore.workflowId;
-		if (
-			!currentSessionId.value ||
-			currentSessionWorkflowId.value === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
-			currentSessionWorkflowId.value === activeWorkflowId
-		) {
-			return;
-		}
-		resetAssistantChat();
-	});
-
 	function resetAssistantChat() {
 		clearMessages();
 		currentSessionId.value = undefined;
@@ -310,11 +296,7 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 				{ withPostHog: true },
 			);
 			// Track first user message in support chat now that we have a session id
-			if (
-				usersMessages.value.length === 1 &&
-				!currentSessionId.value &&
-				chatSessionTask.value === 'support'
-			) {
+			if (usersMessages.value.length === 1 && chatSessionTask.value === 'support') {
 				const firstUserMessage = usersMessages.value[0] as ChatUI.TextMessage;
 				trackUserMessage(firstUserMessage.content, false);
 			}
@@ -330,6 +312,8 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 
 	function onDoneStreaming(id: string) {
 		stopStreaming();
+		workflowDataStale.value = false;
+		workflowExecutionDataStale.value = false;
 		lastUnread.value = chatMessages.value.find(
 			(msg) =>
 				msg.id === id && !msg.read && msg.role === 'assistant' && READABLE_TYPES.includes(msg.type),
@@ -355,10 +339,81 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 		});
 	}
 
+	/**
+	 * Gets information about the current view and active node to provide context to the assistant
+	 */
+	function getVisualContext(
+		nodeInfo?: ChatRequest.NodeInfo,
+	): ChatRequest.AssistantContext | undefined {
+		if (chatSessionTask.value === 'error') {
+			return undefined;
+		}
+		const currentView = route.name as VIEWS;
+		const activeNode = workflowsStore.activeNode();
+		const activeNodeForLLM = activeNode
+			? assistantHelpers.processNodeForAssistant(activeNode, ['position', 'parameters.notice'])
+			: null;
+		const activeModals = uiStore.activeModals;
+		const isCredentialModalActive = activeModals.includes(CREDENTIAL_EDIT_MODAL_KEY);
+		const activeCredential = isCredentialModalActive
+			? useCredentialsStore().getCredentialTypeByName(uiStore.activeCredentialType ?? '')
+			: undefined;
+		const executionResult = workflowsStore.workflowExecutionData?.data?.resultData;
+		const isCurrentNodeExecuted = Boolean(
+			executionResult?.runData?.hasOwnProperty(activeNode?.name ?? ''),
+		);
+		const currentNodeHasError =
+			executionResult?.error &&
+			'node' in executionResult.error &&
+			executionResult.error.node?.name === activeNode?.name;
+		const nodeError = currentNodeHasError ? (executionResult.error as NodeError) : undefined;
+		const executionStatus = isCurrentNodeExecuted
+			? {
+					status: nodeError ? 'error' : 'success',
+					error: nodeError ? assistantHelpers.simplifyErrorForAssistant(nodeError) : undefined,
+				}
+			: undefined;
+		return {
+			currentView: {
+				name: currentView,
+				description: assistantHelpers.getCurrentViewDescription(currentView),
+			},
+			activeNodeInfo: {
+				node: activeNodeForLLM ?? undefined,
+				nodeIssues: !isCurrentNodeExecuted ? activeNode?.issues : undefined,
+				executionStatus,
+				nodeInputData: nodeInfo?.nodeInputData,
+				referencedNodes: nodeInfo?.schemas,
+			},
+			activeCredentials: activeCredential
+				? {
+						name: activeCredential?.name,
+						displayName: activeCredential?.displayName,
+						authType: nodeInfo?.authType?.name,
+					}
+				: undefined,
+			currentWorkflow: workflowDataStale.value ? workflowsStore.workflow : undefined,
+			executionData:
+				workflowExecutionDataStale.value && executionResult
+					? assistantHelpers.simplifyResultData(executionResult)
+					: undefined,
+		};
+	}
+
 	async function initSupportChat(userMessage: string, credentialType?: ICredentialType) {
-		const id = getRandomId();
 		resetAssistantChat();
 		chatSessionTask.value = credentialType ? 'credentials' : 'support';
+		const activeNode = workflowsStore.activeNode() as INode;
+		const nodeInfo = assistantHelpers.getNodeInfoForAssistant(activeNode);
+		// For the initial message, only provide visual context if the task is support
+		const visualContext =
+			chatSessionTask.value === 'support' ? getVisualContext(nodeInfo) : undefined;
+
+		if (nodeInfo.authType && chatSessionTask.value === 'credentials') {
+			userMessage += ` I am using ${nodeInfo.authType.name}.`;
+		}
+
+		const id = getRandomId();
 		chatSessionCredType.value = credentialType;
 		addUserMessage(userMessage, id);
 		addLoadingAssistantMessage(locale.baseText('aiAssistant.thinkingSteps.thinking'));
@@ -371,6 +426,7 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 			user: {
 				firstName: usersStore.currentUser?.firstName ?? '',
 			},
+			context: visualContext,
 			question: userMessage,
 		};
 		if (credentialType) {
@@ -413,29 +469,10 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 			currentSessionActiveExecutionId.value = workflowsStore.activeExecutionId;
 		}
 
-		// Get all referenced nodes and their schemas
-		const referencedNodeNames = getReferencedNodes(context.node);
-		const schemas = getNodesSchemas(referencedNodeNames);
+		const { authType, nodeInputData, schemas } = assistantHelpers.getNodeInfoForAssistant(
+			context.node,
+		);
 
-		// 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);
-		}
-		let nodeInputData: { inputNodeName?: string; inputData?: IDataObject } | undefined = undefined;
-		const ndvInput = ndvStore.ndvInputData;
-		if (isNodeReferencingInputData(context.node) && ndvInput?.length) {
-			const inputData = ndvStore.ndvInputData[0].json;
-			const inputNodeName = ndvStore.input.nodeName;
-			nodeInputData = {
-				inputNodeName,
-				inputData,
-			};
-		}
 		addLoadingAssistantMessage(locale.baseText('aiAssistant.thinkingSteps.analyzingError'));
 		openChat();
 
@@ -450,7 +487,10 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 						firstName: usersStore.currentUser?.firstName ?? '',
 					},
 					error: context.error,
-					node: processNodeForAssistant(context.node, ['position']),
+					node: assistantHelpers.processNodeForAssistant(context.node, [
+						'position',
+						'parameters.notice',
+					]),
 					nodeInputData,
 					executionSchema: schemas,
 					authType,
@@ -536,6 +576,10 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 			) {
 				nodeExecutionStatus.value = 'not_executed';
 			}
+			const activeNode = workflowsStore.activeNode() as INode;
+			const nodeInfo = assistantHelpers.getNodeInfoForAssistant(activeNode);
+			const userContext = getVisualContext(nodeInfo);
+
 			chatWithAssistant(
 				rootStore.restApiContext,
 				{
@@ -544,6 +588,7 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 						type: 'message',
 						text: chatMessage.text,
 						quickReplyType: chatMessage.quickReplyType,
+						context: userContext,
 					},
 					sessionId: currentSessionId.value,
 				},
@@ -721,6 +766,33 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 		}
 	}
 
+	watch(route, () => {
+		const activeWorkflowId = workflowsStore.workflowId;
+		if (
+			!currentSessionId.value ||
+			currentSessionWorkflowId.value === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
+			currentSessionWorkflowId.value === activeWorkflowId
+		) {
+			return;
+		}
+		resetAssistantChat();
+	});
+
+	watch(
+		() => uiStore.stateIsDirty,
+		() => {
+			workflowDataStale.value = true;
+		},
+	);
+
+	watch(
+		() => workflowsStore.workflowExecutionData?.data?.resultData ?? {},
+		() => {
+			workflowExecutionDataStale.value = true;
+		},
+		{ deep: true, immediate: true },
+	);
+
 	return {
 		isAssistantEnabled,
 		canShowAssistantButtonsOnCanvas,
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/editor-ui/src/stores/credentials.store.ts
index ec71aa5b29..4e87eaaf98 100644
--- a/packages/editor-ui/src/stores/credentials.store.ts
+++ b/packages/editor-ui/src/stores/credentials.store.ts
@@ -1,32 +1,31 @@
 import type {
-	INodeUi,
-	IUsedCredential,
 	ICredentialMap,
 	ICredentialsDecryptedResponse,
 	ICredentialsResponse,
 	ICredentialsState,
 	ICredentialTypeMap,
+	INodeUi,
+	IUsedCredential,
 } from '@/Interface';
 import * as credentialsApi from '@/api/credentials';
 import * as credentialsEeApi from '@/api/credentials.ee';
-import { makeRestApiRequest } from '@/utils/apiUtils';
-import { getAppNameFromCredType } from '@/utils/nodeTypesUtils';
 import { EnterpriseEditionFeature, STORES } from '@/constants';
 import { i18n } from '@/plugins/i18n';
+import type { ProjectSharingData } from '@/types/projects.types';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import { getAppNameFromCredType } from '@/utils/nodeTypesUtils';
+import { splitName } from '@/utils/projects.utils';
+import { isEmpty, isPresent } from '@/utils/typesUtils';
 import type {
 	ICredentialsDecrypted,
 	ICredentialType,
 	INodeCredentialTestResult,
-	INodeTypeDescription,
 } from 'n8n-workflow';
 import { defineStore } from 'pinia';
-import { useRootStore } from './root.store';
-import { useNodeTypesStore } from './nodeTypes.store';
-import { useSettingsStore } from './settings.store';
-import { isEmpty } from '@/utils/typesUtils';
-import type { ProjectSharingData } from '@/types/projects.types';
-import { splitName } from '@/utils/projects.utils';
 import { computed, ref } from 'vue';
+import { useNodeTypesStore } from './nodeTypes.store';
+import { useRootStore } from './root.store';
+import { useSettingsStore } from './settings.store';
 
 const DEFAULT_CREDENTIAL_NAME = 'Unnamed credential';
 const DEFAULT_CREDENTIAL_POSTFIX = 'account';
@@ -131,22 +130,15 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 
 	const getNodesWithAccess = computed(() => {
 		return (credentialTypeName: string) => {
+			const credentialType = getCredentialTypeByName.value(credentialTypeName);
+			if (!credentialType) {
+				return [];
+			}
 			const nodeTypesStore = useNodeTypesStore();
-			const allNodeTypes: INodeTypeDescription[] = nodeTypesStore.allNodeTypes;
 
-			return allNodeTypes.filter((nodeType: INodeTypeDescription) => {
-				if (!nodeType.credentials) {
-					return false;
-				}
-
-				for (const credentialTypeDescription of nodeType.credentials) {
-					if (credentialTypeDescription.name === credentialTypeName) {
-						return true;
-					}
-				}
-
-				return false;
-			});
+			return (credentialType.supportedNodes ?? [])
+				.map((nodeType) => nodeTypesStore.getNodeType(nodeType))
+				.filter(isPresent);
 		};
 	});
 
diff --git a/packages/editor-ui/src/stores/orchestration.store.ts b/packages/editor-ui/src/stores/orchestration.store.ts
index 4a71e8fe28..7cc382cfcd 100644
--- a/packages/editor-ui/src/stores/orchestration.store.ts
+++ b/packages/editor-ui/src/stores/orchestration.store.ts
@@ -32,15 +32,15 @@ export const useOrchestrationStore = defineStore('orchestrationManager', {
 	}),
 	actions: {
 		updateWorkerStatus(data: WorkerStatus) {
-			this.workers[data.workerId] = data;
-			if (!this.workersHistory[data.workerId]) {
-				this.workersHistory[data.workerId] = [];
+			this.workers[data.senderId] = data;
+			if (!this.workersHistory[data.senderId]) {
+				this.workersHistory[data.senderId] = [];
 			}
-			this.workersHistory[data.workerId].push({ data, timestamp: Date.now() });
-			if (this.workersHistory[data.workerId].length > WORKER_HISTORY_LENGTH) {
-				this.workersHistory[data.workerId].shift();
+			this.workersHistory[data.senderId].push({ data, timestamp: Date.now() });
+			if (this.workersHistory[data.senderId].length > WORKER_HISTORY_LENGTH) {
+				this.workersHistory[data.senderId].shift();
 			}
-			this.workersLastUpdated[data.workerId] = Date.now();
+			this.workersLastUpdated[data.senderId] = Date.now();
 
 			this.initialStatusReceived = true;
 		},
diff --git a/packages/editor-ui/src/stores/posthog.store.ts b/packages/editor-ui/src/stores/posthog.store.ts
index d540fe290d..59f7bb2ee2 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 { useDebounce } from '@/composables/useDebounce';
 import { useTelemetry } from '@/composables/useTelemetry';
 
@@ -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/editor-ui/src/stores/projects.store.ts b/packages/editor-ui/src/stores/projects.store.ts
index 98ecf52a56..21b275ef2f 100644
--- a/packages/editor-ui/src/stores/projects.store.ts
+++ b/packages/editor-ui/src/stores/projects.store.ts
@@ -19,6 +19,8 @@ import type { IWorkflowDb } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { STORES } from '@/constants';
+import { useUsersStore } from '@/stores/users.store';
+import { getResourcePermissions } from '@/permissions';
 
 export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 	const route = useRoute();
@@ -26,6 +28,7 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 	const settingsStore = useSettingsStore();
 	const workflowsStore = useWorkflowsStore();
 	const credentialsStore = useCredentialsStore();
+	const usersStore = useUsersStore();
 
 	const projects = ref<ProjectListItem[]>([]);
 	const myProjects = ref<ProjectListItem[]>([]);
@@ -38,6 +41,13 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 	});
 	const projectNavActiveIdState = ref<string | string[] | null>(null);
 
+	const globalProjectPermissions = computed(
+		() => getResourcePermissions(usersStore.currentUser?.globalScopes).project,
+	);
+	const availableProjects = computed(() =>
+		globalProjectPermissions.value.list ? projects.value : myProjects.value,
+	);
+
 	const currentProjectId = computed(
 		() =>
 			(route.params?.projectId as string | undefined) ??
@@ -91,6 +101,14 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 		personalProject.value = await projectsApi.getPersonalProject(rootStore.restApiContext);
 	};
 
+	const getAvailableProjects = async () => {
+		if (globalProjectPermissions.value.list) {
+			await getAllProjects();
+		} else {
+			await getMyProjects();
+		}
+	};
+
 	const fetchProject = async (id: string) =>
 		await projectsApi.getProject(rootStore.restApiContext, id);
 
@@ -189,6 +207,7 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 
 	return {
 		projects,
+		availableProjects,
 		myProjects,
 		personalProject,
 		currentProject,
@@ -206,6 +225,7 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 		getAllProjects,
 		getMyProjects,
 		getPersonalProject,
+		getAvailableProjects,
 		fetchProject,
 		getProject,
 		createProject,
diff --git a/packages/editor-ui/src/stores/root.store.ts b/packages/editor-ui/src/stores/root.store.ts
index be9ba9080c..6e9bee10da 100644
--- a/packages/editor-ui/src/stores/root.store.ts
+++ b/packages/editor-ui/src/stores/root.store.ts
@@ -19,6 +19,7 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		endpointFormWaiting: 'form-waiting',
 		endpointWebhook: 'webhook',
 		endpointWebhookTest: 'webhook-test',
+		endpointWebhookWaiting: 'webhook-waiting',
 		pushConnectionActive: true,
 		timezone: 'America/New_York',
 		executionTimeout: -1,
@@ -43,10 +44,16 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 
 	const formTestUrl = computed(() => `${state.value.urlBaseEditor}${state.value.endpointFormTest}`);
 
-	const formWaitingUrl = computed(() => `${state.value.baseUrl}${state.value.endpointFormWaiting}`);
+	const formWaitingUrl = computed(
+		() => `${state.value.urlBaseEditor}${state.value.endpointFormWaiting}`,
+	);
 
 	const webhookUrl = computed(() => `${state.value.urlBaseWebhook}${state.value.endpointWebhook}`);
 
+	const webhookWaitingUrl = computed(
+		() => `${state.value.urlBaseEditor}${state.value.endpointWebhookWaiting}`,
+	);
+
 	const pushRef = computed(() => state.value.pushRef);
 
 	const binaryDataMode = computed(() => state.value.binaryDataMode);
@@ -131,6 +138,10 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		state.value.endpointWebhookTest = endpointWebhookTest;
 	};
 
+	const setEndpointWebhookWaiting = (endpointWebhookWaiting: string) => {
+		state.value.endpointWebhookWaiting = endpointWebhookWaiting;
+	};
+
 	const setTimezone = (timezone: string) => {
 		state.value.timezone = timezone;
 		setGlobalState({ defaultTimezone: timezone });
@@ -177,6 +188,7 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		formWaitingUrl,
 		webhookUrl,
 		webhookTestUrl,
+		webhookWaitingUrl,
 		restUrl,
 		restCloudApiContext,
 		restApiContext,
@@ -200,6 +212,7 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		setEndpointFormWaiting,
 		setEndpointWebhook,
 		setEndpointWebhookTest,
+		setEndpointWebhookWaiting,
 		setTimezone,
 		setExecutionTimeout,
 		setMaxExecutionTimeout,
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index 7a0cf1c2ab..321ed5b437 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -17,7 +17,6 @@ import { useUIStore } from './ui.store';
 import { useUsersStore } from './users.store';
 import { useVersionsStore } from './versions.store';
 import { makeRestApiRequest } from '@/utils/apiUtils';
-import { useTitleChange } from '@/composables/useTitleChange';
 import { useToast } from '@/composables/useToast';
 import { i18n } from '@/plugins/i18n';
 
@@ -88,6 +87,8 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 
 	const isAiAssistantEnabled = computed(() => settings.value.aiAssistant?.enabled);
 
+	const isAskAiEnabled = computed(() => settings.value.askAi?.enabled);
+
 	const showSetupPage = computed(() => userManagement.value.showSetupOnFirstLoad);
 
 	const deploymentType = computed(() => settings.value.deployment?.type || 'default');
@@ -236,6 +237,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		rootStore.setEndpointFormWaiting(fetchedSettings.endpointFormWaiting);
 		rootStore.setEndpointWebhook(fetchedSettings.endpointWebhook);
 		rootStore.setEndpointWebhookTest(fetchedSettings.endpointWebhookTest);
+		rootStore.setEndpointWebhookWaiting(fetchedSettings.endpointWebhookWaiting);
 		rootStore.setTimezone(fetchedSettings.timezone);
 		rootStore.setExecutionTimeout(fetchedSettings.executionTimeout);
 		rootStore.setMaxExecutionTimeout(fetchedSettings.maxExecutionTimeout);
@@ -258,9 +260,6 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 
 			ExpressionEvaluatorProxy.setEvaluator(settings.value.expressions.evaluator);
 
-			// Re-compute title since settings are now available
-			useTitleChange().titleReset();
-
 			initialized.value = true;
 		} catch (e) {
 			showToast({
@@ -308,21 +307,19 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		templatesEndpointHealthy.value = true;
 	};
 
-	const getApiKey = async () => {
+	const getApiKeys = async () => {
 		const rootStore = useRootStore();
-		const { apiKey } = await publicApiApi.getApiKey(rootStore.restApiContext);
-		return apiKey;
+		return await publicApiApi.getApiKeys(rootStore.restApiContext);
 	};
 
 	const createApiKey = async () => {
 		const rootStore = useRootStore();
-		const { apiKey } = await publicApiApi.createApiKey(rootStore.restApiContext);
-		return apiKey;
+		return await publicApiApi.createApiKey(rootStore.restApiContext);
 	};
 
-	const deleteApiKey = async () => {
+	const deleteApiKey = async (id: string) => {
 		const rootStore = useRootStore();
-		await publicApiApi.deleteApiKey(rootStore.restApiContext);
+		await publicApiApi.deleteApiKey(rootStore.restApiContext, id);
 	};
 
 	const getLdapConfig = async () => {
@@ -415,6 +412,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		saveManualExecutions,
 		saveDataProgressExecution,
 		isCommunityPlan,
+		isAskAiEnabled,
 		reset,
 		testLdapConnection,
 		getLdapConfig,
@@ -423,7 +421,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		runLdapSync,
 		getTimezones,
 		createApiKey,
-		getApiKey,
+		getApiKeys,
 		deleteApiKey,
 		testTemplatesEndpoint,
 		submitContactInfo,
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index f66f83f250..4121099291 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -35,9 +35,9 @@ import {
 	WORKFLOW_HISTORY_VERSION_RESTORE,
 	SETUP_CREDENTIALS_MODAL_KEY,
 	PROJECT_MOVE_RESOURCE_MODAL,
-	PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
 	NEW_ASSISTANT_SESSION_MODAL,
 	PROMPT_MFA_CODE_MODAL_KEY,
+	COMMUNITY_PLUS_ENROLLMENT_MODAL,
 } from '@/constants';
 import type {
 	CloudUpdateLinkSourceType,
@@ -126,8 +126,8 @@ export const useUIStore = defineStore(STORES.UI, () => {
 				WORKFLOW_HISTORY_VERSION_RESTORE,
 				SETUP_CREDENTIALS_MODAL_KEY,
 				PROJECT_MOVE_RESOURCE_MODAL,
-				PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
 				NEW_ASSISTANT_SESSION_MODAL,
+				COMMUNITY_PLUS_ENROLLMENT_MODAL,
 			].map((modalKey) => [modalKey, { open: false }]),
 		),
 		[DELETE_USER_MODAL_KEY]: {
@@ -197,10 +197,10 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	const appGridWidth = ref<number>(0);
 
 	// Last interacted with - Canvas v2 specific
-	const lastInteractedWithNodeConnection = ref<Connection | null>(null);
+	const lastInteractedWithNodeConnection = ref<Connection | undefined>();
 	const lastInteractedWithNodeHandle = ref<string | null>(null);
-	const lastInteractedWithNodeId = ref<string | null>(null);
-	const lastCancelledConnectionPosition = ref<XYPosition | null>(null);
+	const lastInteractedWithNodeId = ref<string | undefined>();
+	const lastCancelledConnectionPosition = ref<XYPosition | undefined>();
 
 	const settingsStore = useSettingsStore();
 	const workflowsStore = useWorkflowsStore();
@@ -305,6 +305,8 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		}, {}),
 	);
 
+	const activeModals = computed(() => modalStack.value.map((modalName) => modalName));
+
 	const fakeDoorsByLocation = computed(() =>
 		fakeDoorFeatures.value.reduce((acc: { [uiLocation: string]: IFakeDoor }, fakeDoor) => {
 			fakeDoor.uiLocations.forEach((uiLocation: IFakeDoorLocation) => {
@@ -620,10 +622,10 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	};
 
 	function resetLastInteractedWith() {
-		lastInteractedWithNodeConnection.value = null;
+		lastInteractedWithNodeConnection.value = undefined;
 		lastInteractedWithNodeHandle.value = null;
-		lastInteractedWithNodeId.value = null;
-		lastCancelledConnectionPosition.value = null;
+		lastInteractedWithNodeId.value = undefined;
+		lastCancelledConnectionPosition.value = undefined;
 	}
 
 	return {
@@ -702,6 +704,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		setNotificationsForView,
 		deleteNotificationsForView,
 		resetLastInteractedWith,
+		activeModals,
 	};
 });
 
diff --git a/packages/editor-ui/src/stores/usage.store.ts b/packages/editor-ui/src/stores/usage.store.ts
index ae2965529d..6fc91c4221 100644
--- a/packages/editor-ui/src/stores/usage.store.ts
+++ b/packages/editor-ui/src/stores/usage.store.ts
@@ -1,7 +1,7 @@
 import { computed, reactive } from 'vue';
 import { defineStore } from 'pinia';
 import type { UsageState } from '@/Interface';
-import { activateLicenseKey, getLicense, renewLicense, requestLicenseTrial } from '@/api/usage';
+import * as usageApi from '@/api/usage';
 import { useRootStore } from '@/stores/root.store';
 import { useSettingsStore } from '@/stores/settings.store';
 
@@ -63,19 +63,19 @@ export const useUsageStore = defineStore('usage', () => {
 	};
 
 	const getLicenseInfo = async () => {
-		const data = await getLicense(rootStore.restApiContext);
+		const data = await usageApi.getLicense(rootStore.restApiContext);
 		setData(data);
 	};
 
 	const activateLicense = async (activationKey: string) => {
-		const data = await activateLicenseKey(rootStore.restApiContext, { activationKey });
+		const data = await usageApi.activateLicenseKey(rootStore.restApiContext, { activationKey });
 		setData(data);
 		await settingsStore.getSettings();
 	};
 
 	const refreshLicenseManagementToken = async () => {
 		try {
-			const data = await renewLicense(rootStore.restApiContext);
+			const data = await usageApi.renewLicense(rootStore.restApiContext);
 			setData(data);
 		} catch (error) {
 			await getLicenseInfo();
@@ -83,9 +83,12 @@ export const useUsageStore = defineStore('usage', () => {
 	};
 
 	const requestEnterpriseLicenseTrial = async () => {
-		await requestLicenseTrial(rootStore.restApiContext);
+		await usageApi.requestLicenseTrial(rootStore.restApiContext);
 	};
 
+	const registerCommunityEdition = async (email: string) =>
+		await usageApi.registerCommunityEdition(rootStore.restApiContext, { email });
+
 	return {
 		setLoading,
 		getLicenseInfo,
@@ -93,6 +96,7 @@ export const useUsageStore = defineStore('usage', () => {
 		activateLicense,
 		refreshLicenseManagementToken,
 		requestEnterpriseLicenseTrial,
+		registerCommunityEdition,
 		planName,
 		planId,
 		executionLimit,
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index c8464a5d4b..cebb15eea5 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -7,6 +7,7 @@ import {
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	START_NODE_TYPE,
 	STORES,
+	WAIT_NODE_TYPE,
 } from '@/constants';
 import type {
 	ExecutionsQueryFilter,
@@ -52,7 +53,13 @@ import type {
 	IWorkflowSettings,
 	INodeType,
 } from 'n8n-workflow';
-import { deepCopy, NodeConnectionType, NodeHelpers, Workflow } from 'n8n-workflow';
+import {
+	deepCopy,
+	NodeConnectionType,
+	NodeHelpers,
+	SEND_AND_WAIT_OPERATION,
+	Workflow,
+} from 'n8n-workflow';
 import { findLast } from 'lodash-es';
 
 import { useRootStore } from '@/stores/root.store';
@@ -166,6 +173,14 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 	const allNodes = computed<INodeUi[]>(() => workflow.value.nodes);
 
+	const isWaitingExecution = computed(() => {
+		return allNodes.value.some(
+			(node) =>
+				(node.type === WAIT_NODE_TYPE || node.parameters.operation === SEND_AND_WAIT_OPERATION) &&
+				node.disabled !== true,
+		);
+	});
+
 	// Names of all nodes currently on canvas.
 	const canvasNames = computed(() => new Set(allNodes.value.map((n) => n.name)));
 
@@ -652,6 +667,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	function setWorkflowExecutionData(workflowResultData: IExecutionResponse | null) {
+		if (workflowResultData?.data?.waitTill) {
+			delete workflowResultData.data.resultData.runData[
+				workflowResultData.data.resultData.lastNodeExecuted as string
+			];
+		}
 		workflowExecutionData.value = workflowResultData;
 		workflowExecutionPairedItemMappings.value = getPairedItemsMapping(workflowResultData);
 	}
@@ -989,15 +1009,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 	function updateNodeAtIndex(nodeIndex: number, nodeData: Partial<INodeUi>): void {
 		if (nodeIndex !== -1) {
-			const node = workflow.value.nodes[nodeIndex];
-			workflow.value = {
-				...workflow.value,
-				nodes: [
-					...workflow.value.nodes.slice(0, nodeIndex),
-					{ ...node, ...nodeData },
-					...workflow.value.nodes.slice(nodeIndex + 1),
-				],
-			};
+			Object.assign(workflow.value.nodes[nodeIndex], nodeData);
 		}
 	}
 
@@ -1023,12 +1035,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 				issues: remainingNodeIssues,
 			});
 		} else {
-			if (node.issues === undefined) {
-				updateNodeAtIndex(nodeIndex, {
-					issues: {},
-				});
-			}
-
 			updateNodeAtIndex(nodeIndex, {
 				issues: {
 					...node.issues,
@@ -1053,7 +1059,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		workflow.value.nodes.push(nodeData);
 		// Init node metadata
 		if (!nodeMetadata.value[nodeData.name]) {
-			nodeMetadata.value = { ...nodeMetadata.value, [nodeData.name]: {} as INodeMetadata };
+			nodeMetadata.value[nodeData.name] = {} as INodeMetadata;
 		}
 	}
 
@@ -1158,13 +1164,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			parameters: newParameters as INodeParameters,
 		});
 
-		nodeMetadata.value = {
-			...nodeMetadata.value,
-			[node.name]: {
-				...nodeMetadata.value[node.name],
-				parametersLastUpdatedAt: Date.now(),
-			},
-		} as NodeMetadataMap;
+		nodeMetadata.value[node.name].parametersLastUpdatedAt = Date.now();
 	}
 
 	function setLastNodeParameters(updateInformation: IUpdateInformation): void {
@@ -1484,13 +1484,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	function setNodePristine(nodeName: string, isPristine: boolean): void {
-		nodeMetadata.value = {
-			...nodeMetadata.value,
-			[nodeName]: {
-				...nodeMetadata.value[nodeName],
-				pristine: isPristine,
-			},
-		};
+		nodeMetadata.value[nodeName].pristine = isPristine;
 	}
 
 	function resetChatMessages(): void {
@@ -1581,6 +1575,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		getWorkflowResultDataByNodeName,
 		allConnections,
 		allNodes,
+		isWaitingExecution,
 		canvasNames,
 		nodesByName,
 		nodesIssuesExist,
diff --git a/packages/editor-ui/src/styles/plugins/_codemirror.scss b/packages/editor-ui/src/styles/plugins/_codemirror.scss
index 4eb6382dc5..00de6a0136 100644
--- a/packages/editor-ui/src/styles/plugins/_codemirror.scss
+++ b/packages/editor-ui/src/styles/plugins/_codemirror.scss
@@ -307,6 +307,7 @@
 
 	&.cm-completionInfo-right {
 		background-color: var(--color-infobox-background);
+		min-width: 200px;
 	}
 }
 
diff --git a/packages/editor-ui/src/styles/plugins/_vueflow.scss b/packages/editor-ui/src/styles/plugins/_vueflow.scss
index 42fbd391e8..1c70b8e973 100644
--- a/packages/editor-ui/src/styles/plugins/_vueflow.scss
+++ b/packages/editor-ui/src/styles/plugins/_vueflow.scss
@@ -1,11 +1,45 @@
+/**
+ * Resizer
+ */
+
 .vue-flow__resize-control.line {
 	border-color: transparent;
+	z-index: 1;
+
+	&.top {
+		height: var(--spacing-s);
+		border-top-width: var(--spacing-s);
+	}
+
+	&.right {
+		width: var(--spacing-s);
+		border-right-width: var(--spacing-s);
+	}
+
+	&.bottom {
+		height: var(--spacing-s);
+		border-bottom-width: var(--spacing-s);
+	}
+
+	&.left {
+		width: var(--spacing-s);
+		border-left-width: var(--spacing-s);
+	}
 }
 
 .vue-flow__resize-control.handle {
 	background-color: transparent;
+	width: var(--spacing-s);
+	height: var(--spacing-s);
+	border: 0;
+	border-radius: 0;
+	z-index: 1;
 }
 
+/**
+ * Minimap
+ */
+
 .vue-flow__minimap {
 	height: 120px;
 	overflow: hidden;
@@ -24,6 +58,10 @@
 	}
 }
 
+/**
+ * Pane
+ */
+
 .vue-flow__pane {
 	&,
 	&.draggable {
@@ -31,6 +69,10 @@
 	}
 }
 
+/**
+ * Nodes
+ */
+
 .vue-flow__node {
 	&,
 	&.draggable {
@@ -40,4 +82,32 @@
 	&.dragging {
 		cursor: grabbing;
 	}
+
+	&.selected {
+		z-index: 1 !important;
+	}
+
+	&:has(.sticky--active) {
+		z-index: 1 !important;
+	}
+}
+
+/**
+ * Selection
+ */
+
+.vue-flow__nodesselection-rect {
+	box-sizing: content-box;
+	margin-top: calc(-1 * var(--spacing-2xs));
+	margin-left: calc(-1 * var(--spacing-2xs));
+	padding: var(--spacing-2xs);
+}
+
+/**
+ * Edges
+ */
+
+.vue-flow__edges,
+.vue-flow__edge-labels {
+	z-index: 1 !important;
 }
diff --git a/packages/editor-ui/src/types/assistant.types.ts b/packages/editor-ui/src/types/assistant.types.ts
index 1b6ea0a089..c911f5087b 100644
--- a/packages/editor-ui/src/types/assistant.types.ts
+++ b/packages/editor-ui/src/types/assistant.types.ts
@@ -1,5 +1,15 @@
-import type { Schema } from '@/Interface';
-import type { IDataObject, INode, INodeParameters } from 'n8n-workflow';
+import type { VIEWS } from '@/constants';
+import type { IWorkflowDb, NodeAuthenticationOption, Schema } from '@/Interface';
+import type {
+	ExecutionError,
+	ICredentialType,
+	IDataObject,
+	INode,
+	INodeIssues,
+	INodeParameters,
+	IRunExecutionData,
+	ITaskData,
+} from 'n8n-workflow';
 
 export namespace ChatRequest {
 	export interface NodeExecutionSchema {
@@ -9,6 +19,15 @@ export namespace ChatRequest {
 
 	export interface WorkflowContext {
 		executionSchema?: NodeExecutionSchema[];
+		currentWorkflow?: IWorkflowDb;
+		executionData?: IRunExecutionData['resultData'];
+	}
+
+	export interface ExecutionResultData {
+		error?: ExecutionError;
+		runData: Record<string, Array<Omit<ITaskData, 'data'>>>;
+		lastNodeExecuted?: string;
+		metadata?: Record<string, string>;
 	}
 
 	export interface ErrorContext {
@@ -39,6 +58,8 @@ export namespace ChatRequest {
 		user: {
 			firstName: string;
 		};
+		context?: UserContext;
+		workflowContext?: WorkflowContext;
 		question: string;
 	}
 
@@ -69,8 +90,30 @@ export namespace ChatRequest {
 		type: 'message';
 		text: string;
 		quickReplyType?: string;
+		context?: UserContext;
+		workflowContext?: WorkflowContext;
 	}
 
+	export interface UserContext {
+		activeNodeInfo?: {
+			node?: INode;
+			nodeIssues?: INodeIssues;
+			nodeInputData?: IDataObject;
+			referencedNodes?: NodeExecutionSchema[];
+			executionStatus?: {
+				status: string;
+				error?: ErrorContext['error'];
+			};
+		};
+		activeCredentials?: Pick<ICredentialType, 'name' | 'displayName'> & { authType?: string };
+		currentView?: {
+			name: VIEWS;
+			description?: string;
+		};
+	}
+
+	export type AssistantContext = UserContext & WorkflowContext;
+
 	export type RequestPayload =
 		| {
 				payload: InitErrorHelper | InitSupportChat | InitCredHelp;
@@ -146,6 +189,15 @@ export namespace ChatRequest {
 		sessionId?: string;
 		messages: MessageResponse[];
 	}
+
+	export interface NodeInfo {
+		authType?: NodeAuthenticationOption;
+		schemas?: NodeExecutionSchema[];
+		nodeInputData?: {
+			inputNodeName?: string;
+			inputData?: IDataObject;
+		};
+	}
 }
 
 export namespace ReplaceCodeRequest {
@@ -159,3 +211,16 @@ export namespace ReplaceCodeRequest {
 		parameters: INodeParameters;
 	}
 }
+
+export namespace AskAiRequest {
+	export interface RequestPayload {
+		question: string;
+		context: {
+			schema: ChatRequest.NodeExecutionSchema[];
+			inputSchema: ChatRequest.NodeExecutionSchema;
+			pushRef: string;
+			ndvPushRef: string;
+		};
+		forNode: 'code' | 'transform';
+	}
+}
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/editor-ui/src/types/canvas.ts
index 849c67fb0b..4620d80c3a 100644
--- a/packages/editor-ui/src/types/canvas.ts
+++ b/packages/editor-ui/src/types/canvas.ts
@@ -5,9 +5,9 @@ import type {
 	IConnection,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import type { DefaultEdge, Node, NodeProps, Position } from '@vue-flow/core';
+import type { DefaultEdge, Node, NodeProps, Position, OnConnectStartParams } from '@vue-flow/core';
 import type { IExecutionResponse, INodeUi } from '@/Interface';
-import type { Ref } from 'vue';
+import type { ComputedRef, Ref } from 'vue';
 import type { PartialBy } from '@/utils/typeHelpers';
 import type { EventBus } from 'n8n-design-system';
 
@@ -26,13 +26,14 @@ export const canvasConnectionModes = [
 export type CanvasConnectionPort = {
 	type: CanvasConnectionPortType;
 	required?: boolean;
+	maxConnections?: number;
 	index: number;
 	label?: string;
 };
 
 export interface CanvasElementPortWithRenderData extends CanvasConnectionPort {
 	handleId: string;
-	isConnected: boolean;
+	connectionsCount: number;
 	isConnecting: boolean;
 	position: Position;
 	offset?: { top?: string; left?: string };
@@ -131,6 +132,7 @@ export type CanvasConnectionCreateData = {
 };
 
 export interface CanvasInjectionData {
+	isExecuting: Ref<boolean | undefined>;
 	connectingHandle: Ref<ConnectStartEvent | undefined>;
 }
 
@@ -165,13 +167,16 @@ export interface CanvasNodeHandleInjectionData {
 	mode: Ref<CanvasConnectionMode>;
 	type: Ref<NodeConnectionType>;
 	index: Ref<number>;
-	isConnected: Ref<boolean | undefined>;
+	isRequired: Ref<boolean | undefined>;
+	isConnected: ComputedRef<boolean | undefined>;
 	isConnecting: Ref<boolean | undefined>;
 	isReadOnly: Ref<boolean | undefined>;
 	runData: Ref<ExecutionOutputMapData | undefined>;
 }
 
-export type ConnectStartEvent = { handleId: string; handleType: string; nodeId: string };
+export type ConnectStartEvent = {
+	event?: MouseEvent | undefined;
+} & OnConnectStartParams;
 
 export type CanvasNodeMoveEvent = { id: string; position: CanvasNode['position'] };
 
@@ -185,3 +190,10 @@ export type ExecutionOutputMap = {
 		[outputIndex: string]: ExecutionOutputMapData;
 	};
 };
+
+export type BoundingBox = {
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+};
diff --git a/packages/editor-ui/src/utils/__tests__/canvasUtilsV2.spec.ts b/packages/editor-ui/src/utils/__tests__/canvasUtilsV2.spec.ts
index 6761a39480..25ede479f2 100644
--- a/packages/editor-ui/src/utils/__tests__/canvasUtilsV2.spec.ts
+++ b/packages/editor-ui/src/utils/__tests__/canvasUtilsV2.spec.ts
@@ -1,18 +1,18 @@
 import {
-	mapLegacyConnectionsToCanvasConnections,
-	mapLegacyEndpointsToCanvasConnectionPort,
-	getUniqueNodeName,
-	mapCanvasConnectionToLegacyConnection,
-	parseCanvasConnectionHandleString,
 	createCanvasConnectionHandleString,
 	createCanvasConnectionId,
+	mapCanvasConnectionToLegacyConnection,
+	mapLegacyConnectionsToCanvasConnections,
+	mapLegacyEndpointsToCanvasConnectionPort,
+	parseCanvasConnectionHandleString,
+	checkOverlap,
 } from '@/utils/canvasUtilsV2';
-import { NodeConnectionType, type IConnections, type INodeTypeDescription } from 'n8n-workflow';
+import { type IConnections, type INodeTypeDescription, NodeConnectionType } from 'n8n-workflow';
 import type { CanvasConnection } from '@/types';
+import { CanvasConnectionMode } from '@/types';
 import type { INodeUi } from '@/Interface';
 import type { Connection } from '@vue-flow/core';
 import { createTestNode } from '@/__tests__/mocks';
-import { CanvasConnectionMode } from '@/types';
 
 vi.mock('uuid', () => ({
 	v4: vi.fn(() => 'mock-uuid'),
@@ -801,34 +801,71 @@ describe('mapLegacyEndpointsToCanvasConnectionPort', () => {
 			{ type: NodeConnectionType.AiTool, index: 0, label: 'Optional Tool' },
 		]);
 	});
-});
 
-describe('getUniqueNodeName', () => {
-	it('should return the original name if it is unique', () => {
-		const name = 'Node A';
-		const existingNames = new Set(['Node B', 'Node C']);
-		const result = getUniqueNodeName(name, existingNames);
-		expect(result).toBe(name);
-	});
+	it('should map maxConnections correctly', () => {
+		const endpoints: INodeTypeDescription['inputs'] = [
+			NodeConnectionType.Main,
+			{
+				type: NodeConnectionType.AiMemory,
+				maxConnections: 1,
+				displayName: 'Optional Tool',
+				required: false,
+			},
+		];
+		const result = mapLegacyEndpointsToCanvasConnectionPort(endpoints);
 
-	it('should append a number to the name if it already exists', () => {
-		const name = 'Node A';
-		const existingNames = new Set(['Node A', 'Node B']);
-		const result = getUniqueNodeName(name, existingNames);
-		expect(result).toBe('Node A 1');
-	});
-
-	it('should find the next available number for the name', () => {
-		const name = 'Node A';
-		const existingNames = new Set(['Node A', 'Node A 1', 'Node A 2']);
-		const result = getUniqueNodeName(name, existingNames);
-		expect(result).toBe('Node A 3');
-	});
-
-	it('should use UUID if more than 99 variations exist', () => {
-		const name = 'Node A';
-		const existingNames = new Set([...Array(100).keys()].map((i) => `Node A ${i}`).concat([name]));
-		const result = getUniqueNodeName(name, existingNames);
-		expect(result).toBe('Node A mock-uuid');
+		expect(result).toEqual([
+			{
+				type: NodeConnectionType.Main,
+				maxConnections: undefined,
+				index: 0,
+				label: undefined,
+			},
+			{ type: NodeConnectionType.AiMemory, maxConnections: 1, index: 0, label: 'Optional Tool' },
+		]);
+	});
+});
+
+describe('checkOverlap', () => {
+	it('should return true when nodes overlap', () => {
+		const node1 = { x: 0, y: 0, width: 10, height: 10 };
+		const node2 = { x: 5, y: 5, width: 10, height: 10 };
+		expect(checkOverlap(node1, node2)).toBe(true);
+	});
+
+	it('should return false when node1 is completely to the left of node2', () => {
+		const node1 = { x: 0, y: 0, width: 10, height: 10 };
+		const node2 = { x: 15, y: 0, width: 10, height: 10 };
+		expect(checkOverlap(node1, node2)).toBe(false);
+	});
+
+	it('should return false when node2 is completely to the left of node1', () => {
+		const node1 = { x: 15, y: 0, width: 10, height: 10 };
+		const node2 = { x: 0, y: 0, width: 10, height: 10 };
+		expect(checkOverlap(node1, node2)).toBe(false);
+	});
+
+	it('should return false when node1 is completely above node2', () => {
+		const node1 = { x: 0, y: 0, width: 10, height: 10 };
+		const node2 = { x: 0, y: 15, width: 10, height: 10 };
+		expect(checkOverlap(node1, node2)).toBe(false);
+	});
+
+	it('should return false when node2 is completely above node1', () => {
+		const node1 = { x: 0, y: 15, width: 10, height: 10 };
+		const node2 = { x: 0, y: 0, width: 10, height: 10 };
+		expect(checkOverlap(node1, node2)).toBe(false);
+	});
+
+	it('should return false when nodes touch at the edges', () => {
+		const node1 = { x: 0, y: 0, width: 10, height: 10 };
+		const node2 = { x: 10, y: 0, width: 10, height: 10 };
+		expect(checkOverlap(node1, node2)).toBe(false);
+	});
+
+	it('should return false when nodes touch at the corners', () => {
+		const node1 = { x: 0, y: 0, width: 10, height: 10 };
+		const node2 = { x: 10, y: 10, width: 10, height: 10 };
+		expect(checkOverlap(node1, node2)).toBe(false);
 	});
 });
diff --git a/packages/editor-ui/src/utils/__tests__/executionUtils.spec.ts b/packages/editor-ui/src/utils/__tests__/executionUtils.spec.ts
index 68f8456d28..e1748a5bc0 100644
--- a/packages/editor-ui/src/utils/__tests__/executionUtils.spec.ts
+++ b/packages/editor-ui/src/utils/__tests__/executionUtils.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { displayForm, openPopUpWindow } from '../executionUtils';
+import { displayForm, openPopUpWindow, executionFilterToQueryFilter } from '../executionUtils';
 import type { INode, IRunData, IPinData } from 'n8n-workflow';
 
 const FORM_TRIGGER_NODE_TYPE = 'formTrigger';
@@ -15,7 +15,6 @@ vi.mock('../executionUtils', async () => {
 
 describe('displayForm', () => {
 	const getTestUrlMock = vi.fn();
-	const shouldShowFormMock = vi.fn();
 
 	beforeEach(() => {
 		vi.clearAllMocks();
@@ -50,11 +49,8 @@ describe('displayForm', () => {
 			pinData,
 			destinationNode: undefined,
 			directParentNodes: [],
-			formWaitingUrl: 'http://example.com',
-			executionId: undefined,
 			source: undefined,
 			getTestUrl: getTestUrlMock,
-			shouldShowForm: shouldShowFormMock,
 		});
 
 		expect(openPopUpWindow).not.toHaveBeenCalled();
@@ -86,11 +82,8 @@ describe('displayForm', () => {
 			pinData: {},
 			destinationNode: 'Node3',
 			directParentNodes: ['Node4'],
-			formWaitingUrl: 'http://example.com',
-			executionId: '12345',
 			source: undefined,
 			getTestUrl: getTestUrlMock,
-			shouldShowForm: shouldShowFormMock,
 		});
 
 		expect(openPopUpWindow).not.toHaveBeenCalled();
@@ -116,13 +109,18 @@ describe('displayForm', () => {
 			pinData: {},
 			destinationNode: undefined,
 			directParentNodes: [],
-			formWaitingUrl: 'http://example.com',
-			executionId: undefined,
 			source: 'RunData.ManualChatMessage',
 			getTestUrl: getTestUrlMock,
-			shouldShowForm: shouldShowFormMock,
 		});
 
 		expect(openPopUpWindow).not.toHaveBeenCalled();
 	});
+
+	describe('executionFilterToQueryFilter()', () => {
+		it('adds "new" to the filter', () => {
+			expect(executionFilterToQueryFilter({ status: 'new' }).status).toStrictEqual(
+				expect.arrayContaining(['new']),
+			);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/utils/__tests__/expressions.test.ts b/packages/editor-ui/src/utils/__tests__/expressions.test.ts
index a6d1c408fe..c467dc59f5 100644
--- a/packages/editor-ui/src/utils/__tests__/expressions.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/expressions.test.ts
@@ -1,5 +1,9 @@
 import { ExpressionError } from 'n8n-workflow';
-import { stringifyExpressionResult, unwrapExpression } from '../expressions';
+import {
+	removeExpressionPrefix,
+	stringifyExpressionResult,
+	unwrapExpression,
+} from '../expressions';
 
 describe('Utils: Expressions', () => {
 	describe('stringifyExpressionResult()', () => {
@@ -43,4 +47,14 @@ describe('Utils: Expressions', () => {
 			expect(unwrapExpression('{{ $json.foo }}')).toBe('$json.foo');
 		});
 	});
+
+	describe('removeExpressionPrefix', () => {
+		it.each([
+			['=expression', 'expression'],
+			['notAnExpression', 'notAnExpression'],
+			[undefined, ''],
+		])('turns "%s" into "%s"', (input, output) => {
+			expect(removeExpressionPrefix(input)).toBe(output);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/utils/canvasUtilsV2.ts b/packages/editor-ui/src/utils/canvasUtilsV2.ts
index e73890fe9b..c4a49d8c94 100644
--- a/packages/editor-ui/src/utils/canvasUtilsV2.ts
+++ b/packages/editor-ui/src/utils/canvasUtilsV2.ts
@@ -1,9 +1,8 @@
 import type { IConnection, IConnections, INodeTypeDescription } from 'n8n-workflow';
 import type { INodeUi } from '@/Interface';
-import type { CanvasConnection, CanvasConnectionPort } from '@/types';
+import type { BoundingBox, CanvasConnection, CanvasConnectionPort } from '@/types';
 import { CanvasConnectionMode } from '@/types';
 import type { Connection } from '@vue-flow/core';
-import { v4 as uuid } from 'uuid';
 import { isValidCanvasConnectionMode, isValidNodeConnectionType } from '@/utils/typeGuards';
 import { NodeConnectionType } from 'n8n-workflow';
 
@@ -183,27 +182,29 @@ export function mapLegacyEndpointsToCanvasConnectionPort(
 				.slice(0, endpointIndex + 1)
 				.filter((e) => (typeof e === 'string' ? e : e.type) === type).length - 1;
 		const required = typeof endpoint === 'string' ? false : endpoint.required;
+		const maxConnections = typeof endpoint === 'string' ? undefined : endpoint.maxConnections;
 
 		return {
 			type,
 			index,
 			label,
+			...(maxConnections ? { maxConnections } : {}),
 			...(required ? { required } : {}),
 		};
 	});
 }
 
-export function getUniqueNodeName(name: string, existingNames: Set<string>): string {
-	if (!existingNames.has(name)) {
-		return name;
-	}
-
-	for (let i = 1; i < 100; i++) {
-		const newName = `${name} ${i}`;
-		if (!existingNames.has(newName)) {
-			return newName;
-		}
-	}
-
-	return `${name} ${uuid()}`;
+export function checkOverlap(node1: BoundingBox, node2: BoundingBox) {
+	return !(
+		// node1 is completely to the left of node2
+		(
+			node1.x + node1.width <= node2.x ||
+			// node2 is completely to the left of node1
+			node2.x + node2.width <= node1.x ||
+			// node1 is completely above node2
+			node1.y + node1.height <= node2.y ||
+			// node2 is completely above node1
+			node2.y + node2.height <= node1.y
+		)
+	);
 }
diff --git a/packages/editor-ui/src/utils/executionUtils.ts b/packages/editor-ui/src/utils/executionUtils.ts
index 74458ecff8..d0f8916c8f 100644
--- a/packages/editor-ui/src/utils/executionUtils.ts
+++ b/packages/editor-ui/src/utils/executionUtils.ts
@@ -1,7 +1,17 @@
-import type { ExecutionStatus, IDataObject, INode, IPinData, IRunData } from 'n8n-workflow';
+import {
+	SEND_AND_WAIT_OPERATION,
+	type ExecutionStatus,
+	type IDataObject,
+	type INode,
+	type IPinData,
+	type IRunData,
+} from 'n8n-workflow';
 import type { ExecutionFilterType, ExecutionsQueryFilter } from '@/Interface';
 import { isEmpty } from '@/utils/typesUtils';
-import { FORM_TRIGGER_NODE_TYPE, WAIT_NODE_TYPE } from '../constants';
+import { FORM_TRIGGER_NODE_TYPE } from '../constants';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useRootStore } from '@/stores/root.store';
+import { i18n } from '@/plugins/i18n';
 
 export function getDefaultExecutionFilters(): ExecutionFilterType {
 	return {
@@ -64,6 +74,9 @@ export const executionFilterToQueryFilter = (
 		case 'canceled':
 			queryFilter.status = ['canceled'];
 			break;
+		case 'new':
+			queryFilter.status = ['new'];
+			break;
 	}
 
 	return queryFilter;
@@ -76,15 +89,15 @@ export const openPopUpWindow = (
 	const windowWidth = window.innerWidth;
 	const smallScreen = windowWidth <= 800;
 	if (options?.alwaysInNewTab || smallScreen) {
-		window.open(url, '_blank');
+		return window.open(url, '_blank');
 	} else {
 		const height = options?.width || 700;
 		const width = options?.height || window.innerHeight - 50;
 		const left = (window.innerWidth - height) / 2;
 		const top = 50;
 		const features = `width=${height},height=${width},left=${left},top=${top},resizable=yes,scrollbars=yes`;
-
-		window.open(url, '_blank', features);
+		const windowName = `form-waiting-since-${Date.now()}`;
+		return window.open(url, windowName, features);
 	}
 };
 
@@ -94,57 +107,73 @@ export function displayForm({
 	pinData,
 	destinationNode,
 	directParentNodes,
-	formWaitingUrl,
-	executionId,
 	source,
 	getTestUrl,
-	shouldShowForm,
 }: {
 	nodes: INode[];
 	runData: IRunData | undefined;
 	pinData: IPinData;
 	destinationNode: string | undefined;
 	directParentNodes: string[];
-	formWaitingUrl: string;
-	executionId: string | undefined;
 	source: string | undefined;
 	getTestUrl: (node: INode) => string;
-	shouldShowForm: (node: INode) => boolean;
 }) {
 	for (const node of nodes) {
 		const hasNodeRun = runData && runData?.hasOwnProperty(node.name);
 
 		if (hasNodeRun || pinData[node.name]) continue;
 
-		if (![FORM_TRIGGER_NODE_TYPE, WAIT_NODE_TYPE].includes(node.type)) {
-			continue;
-		}
+		if (![FORM_TRIGGER_NODE_TYPE].includes(node.type)) continue;
 
-		if (
-			destinationNode &&
-			destinationNode !== node.name &&
-			!directParentNodes.includes(node.name)
-		) {
+		if (destinationNode && destinationNode !== node.name && !directParentNodes.includes(node.name))
 			continue;
-		}
 
 		if (node.name === destinationNode || !node.disabled) {
 			let testUrl = '';
-
-			if (node.type === FORM_TRIGGER_NODE_TYPE) {
-				testUrl = getTestUrl(node);
-			}
-
-			if (node.type === WAIT_NODE_TYPE && node.parameters.resume === 'form' && executionId) {
-				if (!shouldShowForm(node)) continue;
-
-				const { webhookSuffix } = (node.parameters.options ?? {}) as IDataObject;
-				const suffix =
-					webhookSuffix && typeof webhookSuffix !== 'object' ? `/${webhookSuffix}` : '';
-				testUrl = `${formWaitingUrl}/${executionId}${suffix}`;
-			}
-
+			if (node.type === FORM_TRIGGER_NODE_TYPE) testUrl = getTestUrl(node);
 			if (testUrl && source !== 'RunData.ManualChatMessage') openPopUpWindow(testUrl);
 		}
 	}
 }
+
+export const waitingNodeTooltip = () => {
+	try {
+		const lastNode =
+			useWorkflowsStore().workflowExecutionData?.data?.executionData?.nodeExecutionStack[0]?.node;
+		const resume = lastNode?.parameters?.resume;
+
+		if (resume) {
+			if (!['webhook', 'form'].includes(resume as string)) {
+				return i18n.baseText('ndv.output.waitNodeWaiting');
+			}
+
+			const { webhookSuffix } = (lastNode.parameters.options ?? {}) as { webhookSuffix: string };
+			const suffix = webhookSuffix && typeof webhookSuffix !== 'object' ? `/${webhookSuffix}` : '';
+
+			let message = '';
+			let resumeUrl = '';
+
+			if (resume === 'form') {
+				resumeUrl = `${useRootStore().formWaitingUrl}/${useWorkflowsStore().activeExecutionId}${suffix}`;
+				message = i18n.baseText('ndv.output.waitNodeWaitingForFormSubmission');
+			}
+
+			if (resume === 'webhook') {
+				resumeUrl = `${useRootStore().webhookWaitingUrl}/${useWorkflowsStore().activeExecutionId}${suffix}`;
+				message = i18n.baseText('ndv.output.waitNodeWaitingForWebhook');
+			}
+
+			if (message && resumeUrl) {
+				return `${message}<a href="${resumeUrl}" target="_blank">${resumeUrl}</a>`;
+			}
+		}
+
+		if (lastNode?.parameters.operation === SEND_AND_WAIT_OPERATION) {
+			return i18n.baseText('ndv.output.sendAndWaitWaitingApproval');
+		}
+	} catch (error) {
+		// do not throw error if could not compose tooltip
+	}
+
+	return '';
+};
diff --git a/packages/editor-ui/src/utils/expressions.ts b/packages/editor-ui/src/utils/expressions.ts
index e19af3716e..3ce0fe04a9 100644
--- a/packages/editor-ui/src/utils/expressions.ts
+++ b/packages/editor-ui/src/utils/expressions.ts
@@ -16,8 +16,8 @@ export const unwrapExpression = (expr: string) => {
 	return expr.replace(/\{\{(.*)\}\}/, '$1').trim();
 };
 
-export const removeExpressionPrefix = (expr: string) => {
-	return expr.startsWith('=') ? expr.slice(1) : expr;
+export const removeExpressionPrefix = (expr: string | null | undefined) => {
+	return expr?.startsWith('=') ? expr.slice(1) : (expr ?? '');
 };
 
 export const isTestableExpression = (expr: string) => {
diff --git a/packages/editor-ui/src/utils/formatters/dateFormatter.ts b/packages/editor-ui/src/utils/formatters/dateFormatter.ts
index 30580f8bca..c0a4526be3 100644
--- a/packages/editor-ui/src/utils/formatters/dateFormatter.ts
+++ b/packages/editor-ui/src/utils/formatters/dateFormatter.ts
@@ -22,3 +22,7 @@ export function convertToDisplayDate(fullDate: Date | string | number): {
 	const [date, time] = formattedDate.split('#');
 	return { date, time };
 }
+
+export const toDayMonth = (fullDate: Date | string) => dateformat(fullDate, 'd mmm');
+
+export const toTime = (fullDate: Date | string) => dateformat(fullDate, 'HH:MM:ss');
diff --git a/packages/editor-ui/src/utils/htmlUtils.ts b/packages/editor-ui/src/utils/htmlUtils.ts
index 1fea9b7833..cf4bb85c6c 100644
--- a/packages/editor-ui/src/utils/htmlUtils.ts
+++ b/packages/editor-ui/src/utils/htmlUtils.ts
@@ -48,10 +48,6 @@ export const sanitizeIfString = <T>(message: T): string | T => {
 	return message;
 };
 
-export function setPageTitle(title: string) {
-	window.document.title = title;
-}
-
 export function convertRemToPixels(rem: string) {
 	return parseInt(rem, 10) * parseFloat(getComputedStyle(document.documentElement).fontSize);
 }
diff --git a/packages/editor-ui/src/utils/nodeTypesUtils.ts b/packages/editor-ui/src/utils/nodeTypesUtils.ts
index 03f930c740..91fe812e4e 100644
--- a/packages/editor-ui/src/utils/nodeTypesUtils.ts
+++ b/packages/editor-ui/src/utils/nodeTypesUtils.ts
@@ -7,8 +7,6 @@ import type {
 	NodeAuthenticationOption,
 	SimplifiedNodeType,
 } from '@/Interface';
-import { useDataSchema } from '@/composables/useDataSchema';
-import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import {
 	CORE_NODES_CATEGORY,
 	MAIN_AUTH_FIELD_NAME,
@@ -20,22 +18,18 @@ import { i18n as locale } from '@/plugins/i18n';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { ChatRequest } from '@/types/assistant.types';
 import { isResourceLocatorValue } from '@/utils/typeGuards';
 import { isJsonKeyObject } from '@/utils/typesUtils';
-import {
-	deepCopy,
-	type IDataObject,
-	type INode,
-	type INodeCredentialDescription,
-	type INodeExecutionData,
-	type INodeProperties,
-	type INodeTypeDescription,
-	type NodeParameterValueType,
-	type ResourceMapperField,
-	type Themed,
+import type {
+	IDataObject,
+	INodeCredentialDescription,
+	INodeExecutionData,
+	INodeProperties,
+	INodeTypeDescription,
+	NodeParameterValueType,
+	ResourceMapperField,
+	Themed,
 } from 'n8n-workflow';
-import { useRouter } from 'vue-router';
 
 /*
 	Constants and utility functions mainly used to get information about
@@ -502,109 +496,3 @@ export const getNodeIconColor = (
 	}
 	return nodeType?.defaults?.color?.toString();
 };
-
-/**
-	Regular expression to extract the node names from the expressions in the template.
-	Supports single quotes, double quotes, and backticks.
-*/
-const entityRegex = /\$\(\s*(\\?["'`])((?:\\.|(?!\1)[^\\])*)\1\s*\)/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;
-}
-
-/**
- * Unescape quotes in the string. Supports single quotes, double quotes, and backticks.
- */
-export function unescapeQuotes(str: string): string {
-	return str.replace(/\\(['"`])/g, '$1');
-}
-
-/**
- * Extract the node names from the expressions in the node parameters.
- */
-export function getReferencedNodes(node: INode): string[] {
-	const referencedNodes: Set<string> = new Set();
-	if (!node) {
-		return [];
-	}
-	// Go through all parameters and check if they contain expressions on any level
-	for (const key in node.parameters) {
-		let names: string[] = [];
-		if (
-			node.parameters[key] &&
-			typeof node.parameters[key] === 'object' &&
-			Object.keys(node.parameters[key]).length
-		) {
-			names = extractNodeNames(JSON.stringify(node.parameters[key]));
-		} else if (typeof node.parameters[key] === 'string' && node.parameters[key]) {
-			names = extractNodeNames(node.parameters[key]);
-		}
-		if (names.length) {
-			names
-				.map((name) => unescapeQuotes(name))
-				.forEach((name) => {
-					referencedNodes.add(name);
-				});
-		}
-	}
-	return referencedNodes.size ? Array.from(referencedNodes) : [];
-}
-
-/**
- * Processes node object before sending it to AI assistant
- * - Removes unnecessary properties
- * - Extracts expressions from the parameters and resolves them
- * @param node original node object
- * @param propsToRemove properties to remove from the node object
- * @returns processed node
- */
-export function processNodeForAssistant(node: INode, propsToRemove: string[]): INode {
-	// Make a copy of the node object so we don't modify the original
-	const nodeForLLM = deepCopy(node);
-	propsToRemove.forEach((key) => {
-		delete nodeForLLM[key as keyof INode];
-	});
-	const workflowHelpers = useWorkflowHelpers({ router: useRouter() });
-	const resolvedParameters = workflowHelpers.getNodeParametersWithResolvedExpressions(
-		nodeForLLM.parameters,
-	);
-	nodeForLLM.parameters = resolvedParameters;
-	return nodeForLLM;
-}
-
-export function isNodeReferencingInputData(node: INode): boolean {
-	const parametersString = JSON.stringify(node.parameters);
-	const references = ['$json', '$input', '$binary'];
-	return references.some((ref) => parametersString.includes(ref));
-}
-
-/**
- * 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 NodeExecutionSchema objects
- */
-export function getNodesSchemas(nodeNames: string[]) {
-	const schemas: ChatRequest.NodeExecutionSchema[] = [];
-	for (const name of nodeNames) {
-		const node = useWorkflowsStore().getNodeByName(name);
-		if (!node) {
-			continue;
-		}
-		const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
-		const schema = getSchemaForExecutionData(executionDataToJson(getInputDataWithPinned(node)));
-		schemas.push({
-			nodeName: node.name,
-			schema,
-		});
-	}
-	return schemas;
-}
diff --git a/packages/editor-ui/src/views/CredentialsView.test.ts b/packages/editor-ui/src/views/CredentialsView.test.ts
index bc2b47a1af..d45c70c78b 100644
--- a/packages/editor-ui/src/views/CredentialsView.test.ts
+++ b/packages/editor-ui/src/views/CredentialsView.test.ts
@@ -1,84 +1,138 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
-import type { Scope } from '@n8n/permissions';
 import { useCredentialsStore } from '@/stores/credentials.store';
-import type { ProjectSharingData } from '@/types/projects.types';
 import CredentialsView from '@/views/CredentialsView.vue';
-import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
+import { useUIStore } from '@/stores/ui.store';
+import { mockedStore } from '@/__tests__/utils';
+import { waitFor, within, fireEvent } from '@testing-library/vue';
+import { CREDENTIAL_SELECT_MODAL_KEY, STORES } from '@/constants';
+import userEvent from '@testing-library/user-event';
+import { useProjectsStore } from '@/stores/projects.store';
+import type { Project } from '@/types/projects.types';
+import { useRouter } from 'vue-router';
 
-vi.mock('@/components/layouts/ResourcesListLayout.vue', async (importOriginal) => {
-	const original = await importOriginal<typeof ResourcesListLayout>();
+vi.mock('vue-router', async () => {
+	const actual = await vi.importActual('vue-router');
+	const push = vi.fn();
+	const replace = vi.fn();
 	return {
-		default: {
-			...original.default,
-			render: vi.fn(),
-			setup: vi.fn(),
-		},
+		...actual,
+		// your mocked methods
+		useRouter: () => ({
+			push,
+			replace,
+		}),
 	};
 });
 
+const initialState = {
+	[STORES.SETTINGS]: {
+		settings: { enterprise: { variables: true, projects: { team: { limit: -1 } } } },
+	},
+};
+
 const renderComponent = createComponentRenderer(CredentialsView);
+let router: ReturnType<typeof useRouter>;
 
 describe('CredentialsView', () => {
-	describe('with fake stores', () => {
-		let credentialsStore: ReturnType<typeof useCredentialsStore>;
+	beforeEach(() => {
+		createTestingPinia({ initialState });
+		router = useRouter();
+	});
 
-		beforeEach(() => {
-			createTestingPinia();
-			credentialsStore = useCredentialsStore();
-		});
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
 
-		afterAll(() => {
-			vi.resetAllMocks();
-		});
-		it('should have ResourcesListLayout render with necessary keys from credential object', () => {
-			const homeProject: ProjectSharingData = {
+	it('should render credentials', () => {
+		const credentialsStore = mockedStore(useCredentialsStore);
+		credentialsStore.allCredentials = [
+			{
 				id: '1',
 				name: 'test',
-				type: 'personal',
+				type: 'test',
 				createdAt: '2021-05-05T00:00:00Z',
 				updatedAt: '2021-05-05T00:00:00Z',
-			};
-			const scopes: Scope[] = ['credential:move', 'credential:delete'];
-			const sharedWithProjects: ProjectSharingData[] = [
-				{
-					id: '2',
-					name: 'test 2',
-					type: 'personal',
-					createdAt: '2021-05-05T00:00:00Z',
-					updatedAt: '2021-05-05T00:00:00Z',
-				},
-			];
-			vi.spyOn(credentialsStore, 'allCredentials', 'get').mockReturnValue([
+			},
+		];
+		const projectsStore = mockedStore(useProjectsStore);
+		projectsStore.isProjectHome = false;
+		const { getByTestId } = renderComponent();
+		expect(getByTestId('resources-list-item')).toBeVisible();
+	});
+
+	it('should disable cards based on permissions', () => {
+		const credentialsStore = mockedStore(useCredentialsStore);
+		credentialsStore.allCredentials = [
+			{
+				id: '1',
+				name: 'test',
+				type: 'test',
+				createdAt: '2021-05-05T00:00:00Z',
+				updatedAt: '2021-05-05T00:00:00Z',
+				scopes: ['credential:update'],
+			},
+			{
+				id: '2',
+				name: 'test2',
+				type: 'test2',
+				createdAt: '2021-05-05T00:00:00Z',
+				updatedAt: '2021-05-05T00:00:00Z',
+			},
+		];
+		const projectsStore = mockedStore(useProjectsStore);
+		projectsStore.isProjectHome = false;
+		const { getAllByTestId } = renderComponent();
+
+		const items = getAllByTestId('resources-list-item');
+		expect(items.length).toBe(2);
+
+		expect(within(items[1]).getByText('Read only')).toBeInTheDocument();
+	});
+
+	describe('create credential', () => {
+		it('should show modal based on route param', async () => {
+			const uiStore = mockedStore(useUIStore);
+			renderComponent({ props: { credentialId: 'create' } });
+			expect(uiStore.openModal).toHaveBeenCalledWith(CREDENTIAL_SELECT_MODAL_KEY);
+		});
+
+		it('should update credentialId route param to create', async () => {
+			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.isProjectHome = false;
+			projectsStore.currentProject = { scopes: ['credential:create'] } as Project;
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentials = [
 				{
 					id: '1',
 					name: 'test',
 					type: 'test',
 					createdAt: '2021-05-05T00:00:00Z',
 					updatedAt: '2021-05-05T00:00:00Z',
-					homeProject,
-					scopes,
-					sharedWithProjects,
 				},
-			]);
-			renderComponent();
-			expect(ResourcesListLayout.setup).toHaveBeenCalledWith(
-				expect.objectContaining({
-					resources: [
-						expect.objectContaining({
-							type: 'test',
-							homeProject,
-							scopes,
-							sharedWithProjects,
-						}),
-					],
-				}),
-				null,
+			];
+			const { getByTestId } = renderComponent();
+
+			await userEvent.click(getByTestId('resources-list-add'));
+			await waitFor(() =>
+				expect(router.replace).toHaveBeenCalledWith({ params: { credentialId: 'create' } }),
 			);
 		});
+	});
 
-		it('should disable cards based on permissions', () => {
-			vi.spyOn(credentialsStore, 'allCredentials', 'get').mockReturnValue([
+	describe('open existing credential', () => {
+		it('should show modal based on route param', async () => {
+			const uiStore = mockedStore(useUIStore);
+			renderComponent({ props: { credentialId: 'credential-id' } });
+			expect(uiStore.openExistingCredential).toHaveBeenCalledWith('credential-id');
+		});
+
+		it('should update credentialId route param when opened', async () => {
+			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.isProjectHome = false;
+			projectsStore.currentProject = { scopes: ['credential:read'] } as Project;
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentials = [
 				{
 					id: '1',
 					name: 'test',
@@ -87,28 +141,15 @@ describe('CredentialsView', () => {
 					updatedAt: '2021-05-05T00:00:00Z',
 					scopes: ['credential:update'],
 				},
-				{
-					id: '2',
-					name: 'test2',
-					type: 'test2',
-					createdAt: '2021-05-05T00:00:00Z',
-					updatedAt: '2021-05-05T00:00:00Z',
-				},
-			]);
+			];
+			const { getByTestId } = renderComponent();
 
-			renderComponent();
-			expect(ResourcesListLayout.setup).toHaveBeenCalledWith(
-				expect.objectContaining({
-					resources: [
-						expect.objectContaining({
-							readOnly: false,
-						}),
-						expect.objectContaining({
-							readOnly: true,
-						}),
-					],
-				}),
-				null,
+			/**
+			 * userEvent DOES NOT work here
+			 */
+			await fireEvent.click(getByTestId('resources-list-item'));
+			await waitFor(() =>
+				expect(router.replace).toHaveBeenCalledWith({ params: { credentialId: '1' } }),
 			);
 		});
 	});
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index 31040e2b39..cdb11456ea 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -1,152 +1,178 @@
-<script lang="ts">
+<script setup lang="ts">
+import { ref, computed, onMounted, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 import type { ICredentialsResponse, ICredentialTypeMap } from '@/Interface';
-import { defineComponent } from 'vue';
-
 import type { IResource } from '@/components/layouts/ResourcesListLayout.vue';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
 import CredentialCard from '@/components/CredentialCard.vue';
 import type { ICredentialType } from 'n8n-workflow';
-import { CREDENTIAL_SELECT_MODAL_KEY, EnterpriseEditionFeature } from '@/constants';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui.store';
+import {
+	CREDENTIAL_SELECT_MODAL_KEY,
+	CREDENTIAL_EDIT_MODAL_KEY,
+	EnterpriseEditionFeature,
+} from '@/constants';
+import { useUIStore, listenForModalChanges } from '@/stores/ui.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 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 ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import { getResourcePermissions } from '@/permissions';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useI18n } from '@/composables/useI18n';
+import { N8nButton, N8nInputLabel, N8nSelect, N8nOption } from 'n8n-design-system';
 
-export default defineComponent({
-	name: 'CredentialsView',
-	components: {
-		ResourcesListLayout,
-		CredentialCard,
-		ProjectTabs,
-	},
-	data() {
-		return {
-			filters: {
-				search: '',
-				homeProject: '',
-				type: '',
-			},
-			sourceControlStoreUnsubscribe: () => {},
-			loading: false,
-		};
-	},
-	computed: {
-		...mapStores(
-			useCredentialsStore,
-			useNodeTypesStore,
-			useUIStore,
-			useSourceControlStore,
-			useExternalSecretsStore,
-			useProjectsStore,
-		),
-		allCredentials(): IResource[] {
-			return this.credentialsStore.allCredentials.map((credential) => ({
-				id: credential.id,
-				name: credential.name,
-				value: '',
-				updatedAt: credential.updatedAt,
-				createdAt: credential.createdAt,
-				homeProject: credential.homeProject,
-				scopes: credential.scopes,
-				type: credential.type,
-				sharedWithProjects: credential.sharedWithProjects,
-				readOnly: !getResourcePermissions(credential.scopes).credential.update,
-			}));
-		},
-		allCredentialTypes(): ICredentialType[] {
-			return this.credentialsStore.allCredentialTypes;
-		},
-		credentialTypesById(): ICredentialTypeMap {
-			return this.credentialsStore.credentialTypesById;
-		},
-		addCredentialButtonText() {
-			return this.projectsStore.currentProject
-				? 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'() {
-			void this.initialize();
-		},
-	},
-	mounted() {
-		this.sourceControlStoreUnsubscribe = this.sourceControlStore.$onAction(({ name, after }) => {
-			if (name === 'pullWorkfolder' && after) {
-				after(() => {
-					void this.initialize();
-				});
-			}
-		});
-	},
-	beforeUnmount() {
-		this.sourceControlStoreUnsubscribe();
-	},
-	methods: {
-		addCredential() {
-			this.uiStore.openModal(CREDENTIAL_SELECT_MODAL_KEY);
+const props = defineProps<{
+	credentialId?: string;
+}>();
 
-			this.$telemetry.track('User clicked add cred button', {
-				source: 'Creds list',
-			});
-		},
-		async initialize() {
-			this.loading = true;
-			const isVarsEnabled =
-				useSettingsStore().isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Variables];
+const credentialsStore = useCredentialsStore();
+const nodeTypesStore = useNodeTypesStore();
+const uiStore = useUIStore();
+const sourceControlStore = useSourceControlStore();
+const externalSecretsStore = useExternalSecretsStore();
+const projectsStore = useProjectsStore();
 
-			const loadPromises = [
-				this.credentialsStore.fetchAllCredentials(
-					this.$route?.params?.projectId as string | undefined,
-				),
-				this.credentialsStore.fetchCredentialTypes(false),
-				this.externalSecretsStore.fetchAllSecrets(),
-				this.nodeTypesStore.loadNodeTypesIfNotLoaded(),
-				isVarsEnabled ? useEnvironmentsStore().fetchAllVariables() : Promise.resolve(), // for expression resolution
-			];
+const documentTitle = useDocumentTitle();
+const route = useRoute();
+const router = useRouter();
+const telemetry = useTelemetry();
+const i18n = useI18n();
 
-			await Promise.all(loadPromises);
-			this.loading = false;
-		},
-		onFilter(
-			resource: ICredentialsResponse,
-			filters: { type: string[]; search: string },
-			matches: boolean,
-		): boolean {
-			if (filters.type.length > 0) {
-				matches = matches && filters.type.includes(resource.type);
-			}
+const filters = ref({
+	search: '',
+	homeProject: '',
+	type: '',
+});
 
-			if (filters.search) {
-				const searchString = filters.search.toLowerCase();
+const loading = ref(false);
 
-				matches =
-					matches ||
-					(this.credentialTypesById[resource.type] &&
-						this.credentialTypesById[resource.type].displayName
-							.toLowerCase()
-							.includes(searchString));
-			}
+const allCredentials = computed<IResource[]>(() =>
+	credentialsStore.allCredentials.map((credential) => ({
+		id: credential.id,
+		name: credential.name,
+		value: '',
+		updatedAt: credential.updatedAt,
+		createdAt: credential.createdAt,
+		homeProject: credential.homeProject,
+		scopes: credential.scopes,
+		type: credential.type,
+		sharedWithProjects: credential.sharedWithProjects,
+		readOnly: !getResourcePermissions(credential.scopes).credential.update,
+	})),
+);
 
-			return matches;
-		},
+const allCredentialTypes = computed<ICredentialType[]>(() => credentialsStore.allCredentialTypes);
+
+const credentialTypesById = computed<ICredentialTypeMap>(
+	() => credentialsStore.credentialTypesById,
+);
+
+const addCredentialButtonText = computed(() =>
+	projectsStore.currentProject
+		? i18n.baseText('credentials.project.add')
+		: i18n.baseText('credentials.add'),
+);
+
+const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
+
+const projectPermissions = computed(() =>
+	getResourcePermissions(
+		projectsStore.currentProject?.scopes ?? projectsStore.personalProject?.scopes,
+	),
+);
+
+const setRouteCredentialId = (credentialId?: string) => {
+	void router.replace({ params: { credentialId } });
+};
+
+const addCredential = () => {
+	setRouteCredentialId('create');
+	telemetry.track('User clicked add cred button', {
+		source: 'Creds list',
+	});
+};
+
+listenForModalChanges({
+	store: uiStore,
+	onModalClosed(modalName) {
+		if ([CREDENTIAL_SELECT_MODAL_KEY, CREDENTIAL_EDIT_MODAL_KEY].includes(modalName as string)) {
+			void router.replace({ params: { credentialId: '' } });
+		}
 	},
 });
+
+watch(
+	() => props.credentialId,
+	(id) => {
+		if (!id) return;
+
+		if (id === 'create') {
+			uiStore.openModal(CREDENTIAL_SELECT_MODAL_KEY);
+			return;
+		}
+
+		uiStore.openExistingCredential(id);
+	},
+	{
+		immediate: true,
+	},
+);
+
+const onFilter = (
+	resource: ICredentialsResponse,
+	filtersToApply: { type: string[]; search: string },
+	matches: boolean,
+): boolean => {
+	if (filtersToApply.type.length > 0) {
+		matches = matches && filtersToApply.type.includes(resource.type);
+	}
+
+	if (filtersToApply.search) {
+		const searchString = filtersToApply.search.toLowerCase();
+
+		matches =
+			matches ||
+			(credentialTypesById.value[resource.type] &&
+				credentialTypesById.value[resource.type].displayName.toLowerCase().includes(searchString));
+	}
+
+	return matches;
+};
+
+const initialize = async () => {
+	loading.value = true;
+	const isVarsEnabled =
+		useSettingsStore().isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Variables];
+
+	const loadPromises = [
+		credentialsStore.fetchAllCredentials(route?.params?.projectId as string | undefined),
+		credentialsStore.fetchCredentialTypes(false),
+		externalSecretsStore.fetchAllSecrets(),
+		nodeTypesStore.loadNodeTypesIfNotLoaded(),
+		isVarsEnabled ? useEnvironmentsStore().fetchAllVariables() : Promise.resolve(), // for expression resolution
+	];
+
+	await Promise.all(loadPromises);
+	loading.value = false;
+};
+
+sourceControlStore.$onAction(({ name, after }) => {
+	if (name !== 'pullWorkfolder') return;
+	after(() => {
+		void initialize();
+	});
+});
+
+watch(() => route?.params?.projectId, initialize);
+
+onMounted(() => {
+	documentTitle.set(i18n.baseText('credentials.heading'));
+});
 </script>
 
 <template>
@@ -168,7 +194,7 @@ export default defineComponent({
 		</template>
 		<template #add-button="{ disabled }">
 			<div>
-				<n8n-button
+				<N8nButton
 					size="large"
 					block
 					:disabled="disabled"
@@ -176,7 +202,7 @@ export default defineComponent({
 					@click="addCredential"
 				>
 					{{ addCredentialButtonText }}
-				</n8n-button>
+				</N8nButton>
 			</div>
 		</template>
 		<template #default="{ data }">
@@ -185,18 +211,19 @@ export default defineComponent({
 				class="mb-2xs"
 				:data="data"
 				:read-only="data.readOnly"
+				@click="setRouteCredentialId"
 			/>
 		</template>
 		<template #filters="{ setKeyValue }">
 			<div class="mb-s">
-				<n8n-input-label
-					:label="$locale.baseText('credentials.filters.type')"
+				<N8nInputLabel
+					:label="i18n.baseText('credentials.filters.type')"
 					:bold="false"
 					size="small"
 					color="text-base"
 					class="mb-3xs"
 				/>
-				<n8n-select
+				<N8nSelect
 					ref="typeInput"
 					:model-value="filters.type"
 					size="medium"
@@ -205,13 +232,13 @@ export default defineComponent({
 					:class="$style['type-input']"
 					@update:model-value="setKeyValue('type', $event)"
 				>
-					<n8n-option
+					<N8nOption
 						v-for="credentialType in allCredentialTypes"
 						:key="credentialType.name"
 						:value="credentialType.name"
 						:label="credentialType.displayName"
 					/>
-				</n8n-select>
+				</N8nSelect>
 			</div>
 		</template>
 	</ResourcesListLayout>
diff --git a/packages/editor-ui/src/views/ExecutionsView.vue b/packages/editor-ui/src/views/ExecutionsView.vue
index bdb37c46ac..7ac9205ce7 100644
--- a/packages/editor-ui/src/views/ExecutionsView.vue
+++ b/packages/editor-ui/src/views/ExecutionsView.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
 import { onBeforeMount, onBeforeUnmount, onMounted } from 'vue';
 import GlobalExecutionsList from '@/components/executions/global/GlobalExecutionsList.vue';
-import { setPageTitle } from '@/utils/htmlUtils';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useExecutionsStore } from '@/stores/executions.store';
 import { useToast } from '@/composables/useToast';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { storeToRefs } from 'pinia';
 import type { ExecutionFilterType } from '@/Interface';
 
@@ -16,6 +16,7 @@ const telemetry = useTelemetry();
 const externalHooks = useExternalHooks();
 const workflowsStore = useWorkflowsStore();
 const executionsStore = useExecutionsStore();
+const documentTitle = useDocumentTitle();
 
 const toast = useToast();
 
@@ -32,7 +33,7 @@ onBeforeMount(async () => {
 });
 
 onMounted(async () => {
-	setPageTitle(`n8n - ${i18n.baseText('executionsList.workflowExecutions')}`);
+	documentTitle.set(i18n.baseText('executionsList.workflowExecutions'));
 	document.addEventListener('visibilitychange', onDocumentVisibilityChange);
 
 	await executionsStore.initialize();
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index 1c0f9b8300..244fdf5212 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -78,7 +78,7 @@ import { useCanvasOperations } from '@/composables/useCanvasOperations';
 import { useExecutionsStore } from '@/stores/executions.store';
 import { useCanvasStore } from '@/stores/canvas.store';
 import { useMessage } from '@/composables/useMessage';
-import { useTitleChange } from '@/composables/useTitleChange';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useTelemetry } from '@/composables/useTelemetry';
@@ -122,7 +122,7 @@ const telemetry = useTelemetry();
 const externalHooks = useExternalHooks();
 const toast = useToast();
 const message = useMessage();
-const { titleReset, titleSet } = useTitleChange();
+const documentTitle = useDocumentTitle();
 const workflowHelpers = useWorkflowHelpers({ router });
 const nodeHelpers = useNodeHelpers();
 
@@ -153,7 +153,8 @@ const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings } = useBef
 	route,
 });
 const { registerCustomAction, unregisterCustomAction } = useGlobalLinkActions();
-const { runWorkflow, stopCurrentExecution, stopWaitingForWebhook } = useRunWorkflow({ router });
+const { runWorkflow, runWorkflowResolvePending, stopCurrentExecution, stopWaitingForWebhook } =
+	useRunWorkflow({ router });
 const {
 	updateNodePosition,
 	updateNodesPosition,
@@ -241,7 +242,7 @@ const fallbackNodes = computed<INodeUi[]>(() =>
 );
 
 const keyBindingsEnabled = computed(() => {
-	return !ndvStore.activeNode;
+	return !ndvStore.activeNode && uiStore.activeModals.length === 0;
 });
 
 /**
@@ -319,12 +320,14 @@ async function initializeRoute() {
 
 		await initializeWorkspaceForExistingWorkflow(workflowId.value);
 
-		nodeHelpers.updateNodesInputIssues();
-		nodeHelpers.updateNodesCredentialsIssues();
-		nodeHelpers.updateNodesParameterIssues();
-
 		await loadCredentials();
 		await initializeDebugMode();
+
+		void nextTick(() => {
+			nodeHelpers.updateNodesInputIssues();
+			nodeHelpers.updateNodesCredentialsIssues();
+			nodeHelpers.updateNodesParameterIssues();
+		});
 	}
 }
 
@@ -369,7 +372,7 @@ async function initializeWorkspaceForExistingWorkflow(id: string) {
 
 async function openWorkflow(data: IWorkflowDb) {
 	resetWorkspace();
-	titleSet(editableWorkflow.value.name, 'IDLE');
+	workflowHelpers.setDocumentTitle(data.name, 'IDLE');
 
 	await initializeWorkspace(data);
 
@@ -548,11 +551,11 @@ async function onCopyNodes(ids: string[]) {
 }
 
 async function onClipboardPaste(plainTextData: string): Promise<void> {
-	if (getNodeViewTab(route) !== MAIN_HEADER_TABS.WORKFLOW) {
-		return;
-	}
-
-	if (!checkIfEditingIsAllowed()) {
+	if (
+		getNodeViewTab(route) !== MAIN_HEADER_TABS.WORKFLOW ||
+		!keyBindingsEnabled.value ||
+		!checkIfEditingIsAllowed()
+	) {
 		return;
 	}
 
@@ -583,7 +586,7 @@ async function onClipboardPaste(plainTextData: string): Promise<void> {
 
 		workflowData = await fetchWorkflowDataFromUrl(plainTextData);
 	} else {
-		// Pasted data is is possible workflow data
+		// Pasted data is possible workflow data
 		workflowData = jsonParse<IWorkflowDataUpdate | null>(plainTextData, { fallbackValue: null });
 	}
 
@@ -771,6 +774,8 @@ function onCreateConnectionCancelled(
 	uiStore.lastCancelledConnectionPosition = [position.x, position.y];
 
 	setTimeout(() => {
+		if (!event.nodeId) return;
+
 		nodeCreatorStore.openNodeCreatorForConnectingNode({
 			connection: {
 				source: event.nodeId,
@@ -946,7 +951,14 @@ const projectPermissions = computed(() => {
 
 const isStoppingExecution = ref(false);
 
-const isWorkflowRunning = computed(() => uiStore.isActionActive.workflowRunning);
+const isWorkflowRunning = computed(() => {
+	if (uiStore.isActionActive.workflowRunning) return true;
+	if (workflowsStore.activeExecutionId) {
+		const execution = workflowsStore.getWorkflowExecution;
+		if (execution && execution.status === 'waiting' && !execution.finished) return true;
+	}
+	return false;
+});
 const isExecutionWaitingForWebhook = computed(() => workflowsStore.executionWaitingForWebhook);
 
 const isExecutionDisabled = computed(() => {
@@ -961,6 +973,7 @@ const isExecutionDisabled = computed(() => {
 	return !containsTriggerNodes.value || allTriggerNodesDisabled.value;
 });
 
+const isRunWorkflowButtonVisible = computed(() => !isOnlyChatTriggerNodeActive.value);
 const isStopExecutionButtonVisible = computed(
 	() => isWorkflowRunning.value && !isExecutionWaitingForWebhook.value,
 );
@@ -981,7 +994,11 @@ const workflowExecutionData = computed(() => workflowsStore.workflowExecutionDat
 async function onRunWorkflow() {
 	trackRunWorkflow();
 
-	await runWorkflow({});
+	if (!isExecutionPreview.value && workflowsStore.isWaitingExecution) {
+		void runWorkflowResolvePending({});
+	} else {
+		void runWorkflow({});
+	}
 }
 
 function trackRunWorkflow() {
@@ -1006,7 +1023,12 @@ async function onRunWorkflowToNode(id: string) {
 	if (!node) return;
 
 	trackRunWorkflowToNode(node);
-	await runWorkflow({ destinationNode: node.name, source: 'Node.executeNode' });
+
+	if (!isExecutionPreview.value && workflowsStore.isWaitingExecution) {
+		void runWorkflowResolvePending({ destinationNode: node.name, source: 'Node.executeNode' });
+	} else {
+		void runWorkflow({ destinationNode: node.name, source: 'Node.executeNode' });
+	}
 }
 
 function trackRunWorkflowToNode(node: INodeUi) {
@@ -1216,7 +1238,7 @@ async function onSourceControlPull() {
 		if (workflowId.value && !uiStore.stateIsDirty) {
 			const workflowData = await workflowsStore.fetchWorkflow(workflowId.value);
 			if (workflowData) {
-				titleSet(workflowData.name, 'IDLE');
+				workflowHelpers.setDocumentTitle(workflowData.name, 'IDLE');
 				await openWorkflow(workflowData);
 			}
 		}
@@ -1370,7 +1392,7 @@ function checkIfRouteIsAllowed() {
 
 async function initializeDebugMode() {
 	if (route.name === VIEWS.EXECUTION_DEBUG) {
-		titleSet(workflowsStore.workflowName, 'DEBUG');
+		workflowHelpers.setDocumentTitle(workflowsStore.workflowName, 'DEBUG');
 
 		if (!workflowsStore.isInDebugMode) {
 			await applyExecutionData(route.params.executionId as string);
@@ -1485,7 +1507,7 @@ onBeforeMount(() => {
 onMounted(() => {
 	canvasStore.startLoading();
 
-	titleReset();
+	documentTitle.reset();
 	resetWorkspace();
 
 	void initializeData().then(() => {
@@ -1546,6 +1568,7 @@ onBeforeUnmount(() => {
 		:fallback-nodes="fallbackNodes"
 		:event-bus="canvasEventBus"
 		:read-only="isCanvasReadOnly"
+		:executing="isWorkflowRunning"
 		:key-bindings="keyBindingsEnabled"
 		@update:nodes:position="onUpdateNodesPosition"
 		@update:node:position="onUpdateNodePosition"
@@ -1577,6 +1600,7 @@ onBeforeUnmount(() => {
 	>
 		<div v-if="!isCanvasReadOnly" :class="$style.executionButtons">
 			<CanvasRunWorkflowButton
+				v-if="isRunWorkflowButtonVisible"
 				:waiting-for-webhook="isExecutionWaitingForWebhook"
 				:disabled="isExecutionDisabled"
 				:executing="isWorkflowRunning"
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index ea5b8555fd..b932d9842a 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -46,7 +46,7 @@ import { useGlobalLinkActions } from '@/composables/useGlobalLinkActions';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import useCanvasMouseSelect from '@/composables/useCanvasMouseSelect';
 import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
-import { useTitleChange } from '@/composables/useTitleChange';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useDataSchema } from '@/composables/useDataSchema';
 import { type ContextMenuAction, useContextMenu } from '@/composables/useContextMenu';
 import { useUniqueNodeName } from '@/composables/useUniqueNodeName';
@@ -234,7 +234,9 @@ export default defineComponent({
 		const { callDebounced } = useDebounce();
 		const canvasPanning = useCanvasPanning(nodeViewRootRef, { onMouseMoveEnd });
 		const workflowHelpers = useWorkflowHelpers({ router });
-		const { runWorkflow, stopCurrentExecution } = useRunWorkflow({ router });
+		const { runWorkflow, stopCurrentExecution, runWorkflowResolvePending } = useRunWorkflow({
+			router,
+		});
 		const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings } = useBeforeUnload({
 			route,
 		});
@@ -254,11 +256,12 @@ export default defineComponent({
 			onMouseMoveEnd,
 			workflowHelpers,
 			runWorkflow,
+			runWorkflowResolvePending,
 			stopCurrentExecution,
 			callDebounced,
 			...useCanvasMouseSelect(),
 			...useGlobalLinkActions(),
-			...useTitleChange(),
+			documentTitle: useDocumentTitle(),
 			...useToast(),
 			...useMessage(),
 			...useUniqueNodeName(),
@@ -422,7 +425,12 @@ export default defineComponent({
 			return this.workflowsStore.getWorkflowExecution;
 		},
 		workflowRunning(): boolean {
-			return this.uiStore.isActionActive.workflowRunning;
+			if (this.uiStore.isActionActive.workflowRunning) return true;
+			if (this.workflowsStore.activeExecutionId) {
+				const execution = this.workflowsStore.getWorkflowExecution;
+				if (execution && execution.status === 'waiting' && !execution.finished) return true;
+			}
+			return false;
 		},
 		currentWorkflow(): string {
 			return this.$route.params.name?.toString() || this.workflowsStore.workflowId;
@@ -591,7 +599,7 @@ export default defineComponent({
 			return;
 		}
 		this.canvasStore.initInstance(this.nodeViewRef);
-		this.titleReset();
+		this.documentTitle.reset();
 
 		window.addEventListener('message', this.onPostMessageReceived);
 
@@ -847,7 +855,12 @@ export default defineComponent({
 			};
 			this.$telemetry.track('User clicked execute node button', telemetryPayload);
 			void this.externalHooks.run('nodeView.onRunNode', telemetryPayload);
-			void this.runWorkflow({ destinationNode: nodeName, source });
+
+			if (!this.isExecutionPreview && this.workflowsStore.isWaitingExecution) {
+				void this.runWorkflowResolvePending({ destinationNode: nodeName, source });
+			} else {
+				void this.runWorkflow({ destinationNode: nodeName, source });
+			}
 		},
 		async onOpenChat() {
 			const telemetryPayload = {
@@ -857,6 +870,7 @@ export default defineComponent({
 			void this.externalHooks.run('nodeView.onOpenChat', telemetryPayload);
 			this.uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
 		},
+
 		async onRunWorkflow() {
 			void this.workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
 				const telemetryPayload = {
@@ -873,7 +887,12 @@ export default defineComponent({
 				void this.externalHooks.run('nodeView.onRunWorkflow', telemetryPayload);
 			});
 
-			await this.runWorkflow({});
+			if (!this.isExecutionPreview && this.workflowsStore.isWaitingExecution) {
+				void this.runWorkflowResolvePending({});
+			} else {
+				void this.runWorkflow({});
+			}
+
 			this.refreshEndpointsErrorsState();
 		},
 		resetEndpointsErrors() {
@@ -932,7 +951,7 @@ export default defineComponent({
 				dangerouslyUseHTMLString: true,
 			});
 		},
-		clearExecutionData() {
+		async clearExecutionData() {
 			this.workflowsStore.workflowExecutionData = null;
 			this.nodeHelpers.updateNodesExecutionIssues();
 		},
@@ -1515,7 +1534,7 @@ export default defineComponent({
 				return;
 			}
 
-			this.nodeHelpers.disableNodes(nodes, true);
+			this.nodeHelpers.disableNodes(nodes, { trackHistory: true, trackBulk: true });
 		},
 
 		togglePinNodes(nodes: INode[], source: 'keyboard-shortcut' | 'context-menu') {
@@ -1719,7 +1738,7 @@ export default defineComponent({
 					this.workflowsStore.executingNode.length = 0;
 					this.uiStore.removeActiveAction('workflowRunning');
 
-					this.titleSet(this.workflowsStore.workflowName, 'IDLE');
+					this.workflowHelpers.setDocumentTitle(this.workflowsStore.workflowName, 'IDLE');
 					this.showMessage({
 						title: this.$locale.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.title'),
 						message: this.$locale.baseText(
@@ -1743,7 +1762,7 @@ export default defineComponent({
 						retryOf: execution.retryOf,
 					};
 					this.workflowsStore.finishActiveExecution(pushData);
-					this.titleSet(execution.workflowData.name, 'IDLE');
+					this.workflowHelpers.setDocumentTitle(execution.workflowData.name, 'IDLE');
 					this.workflowsStore.executingNode.length = 0;
 					this.workflowsStore.setWorkflowExecutionData(executedData as IExecutionResponse);
 					this.uiStore.removeActiveAction('workflowRunning');
@@ -3410,7 +3429,7 @@ export default defineComponent({
 					}
 
 					if (workflow) {
-						this.titleSet(workflow.name, 'IDLE');
+						this.workflowHelpers.setDocumentTitle(workflow.name, 'IDLE');
 						await this.openWorkflow(workflow);
 						await this.checkAndInitDebugMode();
 
@@ -4371,7 +4390,7 @@ export default defineComponent({
 		},
 		async checkAndInitDebugMode() {
 			if (this.$route.name === VIEWS.EXECUTION_DEBUG) {
-				this.titleSet(this.workflowName, 'DEBUG');
+				this.workflowHelpers.setDocumentTitle(this.workflowName, 'DEBUG');
 				if (!this.workflowsStore.isInDebugMode) {
 					await this.applyExecutionData(this.$route.params.executionId as string);
 					this.workflowsStore.isInDebugMode = true;
@@ -4444,7 +4463,7 @@ export default defineComponent({
 					const workflow: IWorkflowDb | undefined =
 						await this.workflowsStore.fetchWorkflow(workflowId);
 					if (workflow) {
-						this.titleSet(workflow.name, 'IDLE');
+						this.workflowHelpers.setDocumentTitle(workflow.name, 'IDLE');
 						await this.openWorkflow(workflow);
 					}
 				}
diff --git a/packages/editor-ui/src/views/ProjectSettings.test.ts b/packages/editor-ui/src/views/ProjectSettings.test.ts
index 333480665d..8dc7a01734 100644
--- a/packages/editor-ui/src/views/ProjectSettings.test.ts
+++ b/packages/editor-ui/src/views/ProjectSettings.test.ts
@@ -51,10 +51,8 @@ describe('ProjectSettings', () => {
 		settingsStore = useSettingsStore();
 
 		vi.spyOn(usersStore, 'fetchUsers').mockImplementation(async () => await Promise.resolve());
-		vi.spyOn(projectsStore, 'getAllProjects').mockImplementation(
-			async () => await Promise.resolve(),
-		);
-		vi.spyOn(projectsStore, 'projects', 'get').mockReturnValue(projects);
+		vi.spyOn(projectsStore, 'getAvailableProjects').mockImplementation(async () => {});
+		vi.spyOn(projectsStore, 'availableProjects', '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 dffc077b48..b752fb2b44 100644
--- a/packages/editor-ui/src/views/ProjectSettings.vue
+++ b/packages/editor-ui/src/views/ProjectSettings.vue
@@ -17,6 +17,7 @@ import { useRolesStore } from '@/stores/roles.store';
 import type { ProjectRole } from '@/types/roles.types';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 
 type FormDataDiff = {
 	name?: string;
@@ -33,6 +34,7 @@ const cloudPlanStore = useCloudPlanStore();
 const toast = useToast();
 const router = useRouter();
 const telemetry = useTelemetry();
+const documentTitle = useDocumentTitle();
 const dialogVisible = ref(false);
 const upgradeDialogVisible = ref(false);
 
@@ -60,7 +62,9 @@ const usersList = computed(() =>
 );
 
 const projects = computed(() =>
-	projectsStore.projects.filter((project) => project.id !== projectsStore.currentProjectId),
+	projectsStore.availableProjects.filter(
+		(project) => project.id !== projectsStore.currentProjectId,
+	),
 );
 const projectRoles = computed(() =>
 	rolesStore.processedProjectRoles.map((role) => ({
@@ -200,7 +204,7 @@ const onSubmit = async () => {
 };
 
 const onDelete = async () => {
-	await projectsStore.getAllProjects();
+	await projectsStore.getAvailableProjects();
 	dialogVisible.value = true;
 };
 
@@ -248,6 +252,7 @@ onBeforeMount(async () => {
 });
 
 onMounted(() => {
+	documentTitle.set(locale.baseText('projects.settings'));
 	selectProjectNameIfMatchesDefault();
 });
 </script>
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index 7ad6781839..2bb67d0440 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -1,8 +1,9 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import type { IUser } from '@/Interface';
+import type { ApiKey, IUser } from '@/Interface';
 import { useToast } from '@/composables/useToast';
 import { useMessage } from '@/composables/useMessage';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 
 import CopyInput from '@/components/CopyInput.vue';
 import { mapStores } from 'pinia';
@@ -23,21 +24,23 @@ export default defineComponent({
 			...useToast(),
 			...useMessage(),
 			...useUIStore(),
+			documentTitle: useDocumentTitle(),
 		};
 	},
 	data() {
 		return {
 			loading: false,
 			mounted: false,
-			apiKey: '',
+			apiKeys: [] as ApiKey[],
 			swaggerUIEnabled: false,
 			apiDocsURL: '',
 		};
 	},
 	mounted() {
+		this.documentTitle.set(this.$locale.baseText('settings.api'));
 		if (!this.isPublicApiEnabled) return;
 
-		void this.getApiKey();
+		void this.getApiKeys();
 		const baseUrl = this.rootStore.baseUrl;
 		const apiPath = this.settingsStore.publicApiPath;
 		const latestVersion = this.settingsStore.publicApiLatestVersion;
@@ -61,7 +64,8 @@ export default defineComponent({
 			return this.settingsStore.isPublicApiEnabled;
 		},
 		isRedactedApiKey(): boolean {
-			return this.apiKey.includes('*');
+			if (!this.apiKeys) return false;
+			return this.apiKeys[0].apiKey.includes('*');
 		},
 	},
 	methods: {
@@ -81,9 +85,9 @@ export default defineComponent({
 				await this.deleteApiKey();
 			}
 		},
-		async getApiKey() {
+		async getApiKeys() {
 			try {
-				this.apiKey = (await this.settingsStore.getApiKey()) || '';
+				this.apiKeys = await this.settingsStore.getApiKeys();
 			} catch (error) {
 				this.showError(error, this.$locale.baseText('settings.api.view.error'));
 			} finally {
@@ -94,7 +98,8 @@ export default defineComponent({
 			this.loading = true;
 
 			try {
-				this.apiKey = (await this.settingsStore.createApiKey()) || '';
+				const newApiKey = await this.settingsStore.createApiKey();
+				this.apiKeys.push(newApiKey);
 			} catch (error) {
 				this.showError(error, this.$locale.baseText('settings.api.create.error'));
 			} finally {
@@ -104,12 +109,12 @@ export default defineComponent({
 		},
 		async deleteApiKey() {
 			try {
-				await this.settingsStore.deleteApiKey();
+				await this.settingsStore.deleteApiKey(this.apiKeys[0].id);
 				this.showMessage({
 					title: this.$locale.baseText('settings.api.delete.toast'),
 					type: 'success',
 				});
-				this.apiKey = '';
+				this.apiKeys = [];
 			} catch (error) {
 				this.showError(error, this.$locale.baseText('settings.api.delete.error'));
 			} finally {
@@ -134,7 +139,7 @@ export default defineComponent({
 			</n8n-heading>
 		</div>
 
-		<div v-if="apiKey">
+		<div v-if="apiKeys.length">
 			<p class="mb-s">
 				<n8n-info-tip :bold="false">
 					<i18n-t keypath="settings.api.view.info" tag="span">
@@ -161,10 +166,11 @@ export default defineComponent({
 						{{ $locale.baseText('generic.delete') }}
 					</n8n-link>
 				</span>
+
 				<div>
 					<CopyInput
-						:label="$locale.baseText('settings.api.view.myKey')"
-						:value="apiKey"
+						:label="apiKeys[0].label"
+						:value="apiKeys[0].apiKey"
 						:copy-button-text="$locale.baseText('generic.clickToCopy')"
 						:toast-title="$locale.baseText('settings.api.view.copy.toast')"
 						:redact-value="true"
diff --git a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
index 0c0ceafbb1..79ce24a468 100644
--- a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
+++ b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
@@ -5,6 +5,7 @@ import {
 } from '@/constants';
 import CommunityPackageCard from '@/components/CommunityPackageCard.vue';
 import { useToast } from '@/composables/useToast';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import type { PublicInstalledPackage } from 'n8n-workflow';
 
 import { useCommunityNodesStore } from '@/stores/communityNodes.store';
@@ -31,6 +32,7 @@ const externalHooks = useExternalHooks();
 const i18n = useI18n();
 const telemetry = useTelemetry();
 const toast = useToast();
+const documentTitle = useDocumentTitle();
 
 const communityNodesStore = useCommunityNodesStore();
 const uiStore = useUIStore();
@@ -85,6 +87,7 @@ onBeforeMount(() => {
 });
 
 onMounted(async () => {
+	documentTitle.set(i18n.baseText('settings.communityNodes'));
 	try {
 		loading.value = true;
 		await communityNodesStore.fetchInstalledPackages();
diff --git a/packages/editor-ui/src/views/SettingsExternalSecrets.vue b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
index a8fe89fb6c..30aaebeae1 100644
--- a/packages/editor-ui/src/views/SettingsExternalSecrets.vue
+++ b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
@@ -2,6 +2,7 @@
 import { useUIStore } from '@/stores/ui.store';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { computed, onMounted } from 'vue';
 import ExternalSecretsProviderCard from '@/components/ExternalSecretsProviderCard.ee.vue';
@@ -11,6 +12,7 @@ const i18n = useI18n();
 const uiStore = useUIStore();
 const externalSecretsStore = useExternalSecretsStore();
 const toast = useToast();
+const documentTitle = useDocumentTitle();
 
 const sortedProviders = computed(() => {
 	return ([...externalSecretsStore.providers] as ExternalSecretsProvider[]).sort((a, b) => {
@@ -19,6 +21,7 @@ const sortedProviders = computed(() => {
 });
 
 onMounted(() => {
+	documentTitle.set(i18n.baseText('settings.externalSecrets.title'));
 	if (!externalSecretsStore.isEnterpriseExternalSecretsEnabled) return;
 	try {
 		void externalSecretsStore.fetchAllSecrets();
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index b0c497e817..41227c854e 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -5,6 +5,7 @@ import { capitalizeFirstLetter } from '@/utils/htmlUtils';
 import { convertToDisplayDate } from '@/utils/typesUtils';
 import { useToast } from '@/composables/useToast';
 import { useMessage } from '@/composables/useMessage';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import type {
 	ILdapConfig,
 	ILdapSyncData,
@@ -65,6 +66,7 @@ type CellClassStyleMethodParams<T> = {
 const toast = useToast();
 const i18n = useI18n();
 const message = useMessage();
+const documentTitle = useDocumentTitle();
 
 const settingsStore = useSettingsStore();
 const uiStore = useUIStore();
@@ -585,6 +587,7 @@ const reloadLdapSynchronizations = async () => {
 };
 
 onMounted(async () => {
+	documentTitle.set(i18n.baseText('settings.ldap'));
 	if (!isLDAPFeatureEnabled.value) return;
 	await getLdapConfig();
 });
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index b39f5fd642..fae75b2604 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -13,6 +13,7 @@ import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow';
 import EventDestinationCard from '@/components/SettingsLogStreaming/EventDestinationCard.ee.vue';
 import { createEventBus } from 'n8n-design-system/utils';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 
 export default defineComponent({
 	name: 'SettingsLogStreamingView',
@@ -26,9 +27,11 @@ export default defineComponent({
 			destinations: Array<MessageEventBusDestinationOptions>,
 			disableLicense: false,
 			allDestinations: [] as MessageEventBusDestinationOptions[],
+			documentTitle: useDocumentTitle(),
 		};
 	},
 	async mounted() {
+		this.documentTitle.set(this.$locale.baseText('settings.log-streaming.heading'));
 		if (!this.isLicensed) return;
 
 		// Prepare credentialsStore so modals can pick up credentials
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 0ddbe6e5a5..af1c92519d 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -2,6 +2,7 @@
 import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import type { IFormInputs, IUser, ThemeOption } from '@/Interface';
 import {
 	CHANGE_PASSWORD_MODAL_KEY,
@@ -28,6 +29,7 @@ type UserBasicDetailsWithMfa = UserBasicDetailsForm & {
 
 const i18n = useI18n();
 const { showToast, showError } = useToast();
+const documentTitle = useDocumentTitle();
 
 const hasAnyBasicInfoChanges = ref<boolean>(false);
 const formInputs = ref<null | IFormInputs>(null);
@@ -80,6 +82,7 @@ const hasAnyChanges = computed(() => {
 });
 
 onMounted(() => {
+	documentTitle.set(i18n.baseText('settings.personal.personalSettings'));
 	formInputs.value = [
 		{
 			name: 'firstName',
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.vue b/packages/editor-ui/src/views/SettingsSourceControl.vue
index 23505092da..3928556104 100644
--- a/packages/editor-ui/src/views/SettingsSourceControl.vue
+++ b/packages/editor-ui/src/views/SettingsSourceControl.vue
@@ -8,6 +8,7 @@ import { useToast } from '@/composables/useToast';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import CopyInput from '@/components/CopyInput.vue';
 import type { TupleToUnion } from '@/utils/typeHelpers';
 import type { SshKeyTypes } from '@/Interface';
@@ -17,6 +18,7 @@ const sourceControlStore = useSourceControlStore();
 const uiStore = useUIStore();
 const toast = useToast();
 const message = useMessage();
+const documentTitle = useDocumentTitle();
 const loadingService = useLoadingService();
 
 const isConnected = ref(false);
@@ -112,6 +114,7 @@ const initialize = async () => {
 };
 
 onMounted(async () => {
+	documentTitle.set(locale.baseText('settings.sourceControl.title'));
 	if (!sourceControlStore.isEnterpriseSourceControlEnabled) return;
 	await initialize();
 });
diff --git a/packages/editor-ui/src/views/SettingsSso.vue b/packages/editor-ui/src/views/SettingsSso.vue
index a73733392b..a9043c41ae 100644
--- a/packages/editor-ui/src/views/SettingsSso.vue
+++ b/packages/editor-ui/src/views/SettingsSso.vue
@@ -7,6 +7,7 @@ import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useRootStore } from '@/stores/root.store';
 
 const IdentityProviderSettingsType = {
@@ -21,6 +22,7 @@ const ssoStore = useSSOStore();
 const uiStore = useUIStore();
 const message = useMessage();
 const toast = useToast();
+const documentTitle = useDocumentTitle();
 
 const ssoActivatedLabel = computed(() =>
 	ssoStore.isSamlLoginEnabled
@@ -144,6 +146,7 @@ const isToggleSsoDisabled = computed(() => {
 });
 
 onMounted(async () => {
+	documentTitle.set(i18n.baseText('settings.sso.title'));
 	if (!ssoStore.isEnterpriseSamlEnabled) {
 		return;
 	}
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.test.ts b/packages/editor-ui/src/views/SettingsUsageAndPlan.test.ts
new file mode 100644
index 0000000000..bd88c02228
--- /dev/null
+++ b/packages/editor-ui/src/views/SettingsUsageAndPlan.test.ts
@@ -0,0 +1,70 @@
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import { useUsageStore } from '@/stores/usage.store';
+import SettingsUsageAndPlan from '@/views/SettingsUsageAndPlan.vue';
+import { useUIStore } from '@/stores/ui.store';
+import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/constants';
+
+vi.mock('vue-router', () => {
+	return {
+		useRoute: () => ({
+			query: {},
+		}),
+		useRouter: () => ({
+			replace: vi.fn(),
+		}),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+let usageStore: ReturnType<typeof mockedStore<typeof useUsageStore>>;
+let uiStore: ReturnType<typeof mockedStore<typeof useUIStore>>;
+
+const renderComponent = createComponentRenderer(SettingsUsageAndPlan);
+
+describe('SettingsUsageAndPlan', () => {
+	beforeEach(() => {
+		createTestingPinia();
+		usageStore = mockedStore(useUsageStore);
+		uiStore = mockedStore(useUIStore);
+
+		usageStore.viewPlansUrl = 'https://subscription.n8n.io';
+		usageStore.managePlanUrl = 'https://subscription.n8n.io';
+	});
+
+	it('should not throw errors when rendering', async () => {
+		expect(() => renderComponent()).not.toThrow();
+	});
+
+	it('should render the title only while loading', async () => {
+		const { getByRole } = renderComponent();
+		expect(getByRole('heading', { level: 2 })).toBeInTheDocument();
+		expect(getByRole('heading').nextElementSibling).toBeNull();
+	});
+
+	it('should not show badge but unlock notice', async () => {
+		usageStore.isLoading = false;
+		usageStore.planName = 'Community';
+		const { getByRole, container } = renderComponent();
+		expect(getByRole('heading', { level: 3 })).toHaveTextContent('Community');
+		expect(container.querySelector('.n8n-badge')).toBeNull();
+
+		expect(getByRole('button', { name: 'Unlock' })).toBeVisible();
+
+		await userEvent.click(getByRole('button', { name: 'Unlock' }));
+		expect(uiStore.openModal).toHaveBeenCalledWith(COMMUNITY_PLUS_ENROLLMENT_MODAL);
+	});
+
+	it('should show community registered badge', async () => {
+		usageStore.isLoading = false;
+		usageStore.planName = 'Registered Community';
+		const { getByRole, container } = renderComponent();
+		expect(getByRole('heading', { level: 3 })).toHaveTextContent('Community Edition');
+		expect(getByRole('heading', { level: 3 })).toContain(container.querySelector('.n8n-badge'));
+		expect(container.querySelector('.n8n-badge')).toHaveTextContent('Registered');
+	});
+});
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
index 85ac34af9a..b1df9d2fa9 100644
--- a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
+++ b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
@@ -7,13 +7,17 @@ import { telemetry } from '@/plugins/telemetry';
 import { i18n as locale } from '@/plugins/i18n';
 import { useUIStore } from '@/stores/ui.store';
 import { useToast } from '@/composables/useToast';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { hasPermission } from '@/utils/rbac/permissions';
+import N8nInfoTip from 'n8n-design-system/components/N8nInfoTip';
+import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/constants';
 
 const usageStore = useUsageStore();
 const route = useRoute();
 const router = useRouter();
 const uiStore = useUIStore();
 const toast = useToast();
+const documentTitle = useDocumentTitle();
 
 const queryParamCallback = ref<string>(
 	`callback=${encodeURIComponent(`${window.location.origin}${window.location.pathname}`)}`,
@@ -30,6 +34,20 @@ const canUserActivateLicense = computed(() =>
 	hasPermission(['rbac'], { rbac: { scope: 'license:manage' } }),
 );
 
+const badgedPlanName = computed(() => {
+	const [badge, name] = usageStore.planName.split(' ');
+	return {
+		name,
+		badge,
+	};
+});
+
+const isCommunity = computed(() => usageStore.planName.toLowerCase() === 'community');
+
+const isCommunityEditionRegistered = computed(
+	() => usageStore.planName.toLowerCase() === 'registered community',
+);
+
 const showActivationSuccess = () => {
 	toast.showMessage({
 		type: 'success',
@@ -64,6 +82,7 @@ const onLicenseActivation = async () => {
 };
 
 onMounted(async () => {
+	documentTitle.set(locale.baseText('settings.usageAndPlan.title'));
 	usageStore.setLoading(true);
 	if (route.query.key) {
 		try {
@@ -118,15 +137,21 @@ const onDialogClosed = () => {
 const onDialogOpened = () => {
 	activationKeyInput.value?.focus();
 };
+
+const openCommunityRegisterModal = () => {
+	uiStore.openModal(COMMUNITY_PLUS_ENROLLMENT_MODAL);
+};
 </script>
 
 <template>
 	<div class="settings-usage-and-plan">
-		<n8n-heading size="2xlarge">{{ locale.baseText('settings.usageAndPlan.title') }}</n8n-heading>
+		<n8n-heading tag="h2" size="2xlarge">{{
+			locale.baseText('settings.usageAndPlan.title')
+		}}</n8n-heading>
 		<div v-if="!usageStore.isLoading">
-			<n8n-heading :class="$style.title" size="large">
+			<n8n-heading tag="h3" :class="$style.title" size="large">
 				<i18n-t keypath="settings.usageAndPlan.description" tag="span">
-					<template #name>{{ usageStore.planName }}</template>
+					<template #name>{{ badgedPlanName.name ?? usageStore.planName }}</template>
 					<template #type>
 						<span v-if="usageStore.planId">{{
 							locale.baseText('settings.usageAndPlan.plan')
@@ -134,8 +159,33 @@ const onDialogOpened = () => {
 						<span v-else>{{ locale.baseText('settings.usageAndPlan.edition') }}</span>
 					</template>
 				</i18n-t>
+				<span v-if="badgedPlanName.badge && badgedPlanName.name" :class="$style.titleTooltip">
+					<N8nTooltip placement="top">
+						<template #content>
+							<i18n-t
+								v-if="isCommunityEditionRegistered"
+								keypath="settings.usageAndPlan.license.communityRegistered.tooltip"
+							>
+							</i18n-t>
+						</template>
+						<N8nBadge>{{ badgedPlanName.badge }}</N8nBadge>
+					</N8nTooltip>
+				</span>
 			</n8n-heading>
 
+			<N8nNotice v-if="isCommunity" class="mt-0" theme="warning">
+				<i18n-t keypath="settings.usageAndPlan.callOut">
+					<template #link>
+						<N8nButton
+							class="pl-0 pr-0"
+							text
+							:label="locale.baseText('settings.usageAndPlan.callOut.link')"
+							@click="openCommunityRegisterModal"
+						/>
+					</template>
+				</i18n-t>
+			</N8nNotice>
+
 			<div :class="$style.quota">
 				<n8n-text size="medium" color="text-light">
 					{{ locale.baseText('settings.usageAndPlan.activeWorkflows') }}
@@ -163,9 +213,7 @@ const onDialogOpened = () => {
 				</div>
 			</div>
 
-			<n8n-info-tip>{{
-				locale.baseText('settings.usageAndPlan.activeWorkflows.hint')
-			}}</n8n-info-tip>
+			<N8nInfoTip>{{ locale.baseText('settings.usageAndPlan.activeWorkflows.hint') }}</N8nInfoTip>
 
 			<div :class="$style.buttons">
 				<n8n-button
@@ -236,7 +284,8 @@ const onDialogOpened = () => {
 }
 
 .title {
-	display: block;
+	display: flex;
+	align-items: center;
 	padding: var(--spacing-2xl) 0 var(--spacing-m);
 }
 
@@ -306,6 +355,12 @@ div[class*='info'] > span > span:last-child {
 	line-height: 1.4;
 	padding: 0 0 0 var(--spacing-4xs);
 }
+
+.titleTooltip {
+	display: flex;
+	align-items: center;
+	margin: 0 0 0 var(--spacing-2xs);
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index a0fea3b4b8..e29bb3e755 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -12,6 +12,7 @@ import { useClipboard } from '@/composables/useClipboard';
 import type { UpdateGlobalRolePayload } from '@/api/users';
 import { computed, onMounted } from 'vue';
 import { useI18n } from '@/composables/useI18n';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 
 const clipboard = useClipboard();
 const { showToast, showError } = useToast();
@@ -20,6 +21,7 @@ const settingsStore = useSettingsStore();
 const uiStore = useUIStore();
 const usersStore = useUsersStore();
 const ssoStore = useSSOStore();
+const documentTitle = useDocumentTitle();
 
 const i18n = useI18n();
 
@@ -28,6 +30,8 @@ const showUMSetupWarning = computed(() => {
 });
 
 onMounted(async () => {
+	documentTitle.set(i18n.baseText('settings.users'));
+
 	if (!showUMSetupWarning.value) {
 		await usersStore.fetchUsers();
 	}
diff --git a/packages/editor-ui/src/views/SigninView.vue b/packages/editor-ui/src/views/SigninView.vue
index 50ed504ea7..fa258c5d7a 100644
--- a/packages/editor-ui/src/views/SigninView.vue
+++ b/packages/editor-ui/src/views/SigninView.vue
@@ -47,6 +47,7 @@ const formConfig: IFormBoxConfig = reactive({
 	title: locale.baseText('auth.signin'),
 	buttonText: locale.baseText('auth.signin'),
 	redirectText: locale.baseText('forgotPassword'),
+	redirectLink: '/forgot-password',
 	inputs: [
 		{
 			name: 'email',
diff --git a/packages/editor-ui/src/views/TemplatesCollectionView.vue b/packages/editor-ui/src/views/TemplatesCollectionView.vue
index 535f664967..5432a8ed54 100644
--- a/packages/editor-ui/src/views/TemplatesCollectionView.vue
+++ b/packages/editor-ui/src/views/TemplatesCollectionView.vue
@@ -13,7 +13,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { isFullTemplatesCollection } from '@/utils/templates/typeGuards';
 import { useRoute, useRouter } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { setPageTitle } from '@/utils/htmlUtils';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useI18n } from '@/composables/useI18n';
 
 const externalHooks = useExternalHooks();
@@ -25,6 +25,7 @@ const route = useRoute();
 const router = useRouter();
 const telemetry = useTelemetry();
 const i18n = useI18n();
+const documentTitle = useDocumentTitle();
 
 const loading = ref(true);
 const notFoundError = ref(false);
@@ -89,9 +90,9 @@ watch(
 	() => collection.value,
 	() => {
 		if (collection.value && 'full' in collection.value && collection.value.full) {
-			setPageTitle(`n8n - Template collection: ${collection.value.name}`);
+			documentTitle.set(`Template collection: ${collection.value.name}`);
 		} else {
-			setPageTitle('n8n - Templates');
+			documentTitle.set('Templates');
 		}
 	},
 );
diff --git a/packages/editor-ui/src/views/TemplatesSearchView.vue b/packages/editor-ui/src/views/TemplatesSearchView.vue
index 86c2b789f4..abb30a3586 100644
--- a/packages/editor-ui/src/views/TemplatesSearchView.vue
+++ b/packages/editor-ui/src/views/TemplatesSearchView.vue
@@ -13,7 +13,6 @@ import type {
 	ITemplatesCategory,
 } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
-import { setPageTitle } from '@/utils/htmlUtils';
 import { CREATOR_HUB_URL, VIEWS } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
@@ -22,6 +21,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useToast } from '@/composables/useToast';
 import { usePostHog } from '@/stores/posthog.store';
 import { useDebounce } from '@/composables/useDebounce';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 
 interface ISearchEvent {
 	search_string: string;
@@ -55,6 +55,7 @@ export default defineComponent({
 		return {
 			callDebounced,
 			...useToast(),
+			documentTitle: useDocumentTitle(),
 		};
 	},
 	data() {
@@ -116,7 +117,7 @@ export default defineComponent({
 		},
 	},
 	async mounted() {
-		setPageTitle('n8n - Templates');
+		this.documentTitle.set('Templates');
 		await this.loadCategories();
 		void this.loadWorkflowsAndCollections(true);
 		void this.usersStore.showPersonalizationSurvey();
diff --git a/packages/editor-ui/src/views/TemplatesWorkflowView.vue b/packages/editor-ui/src/views/TemplatesWorkflowView.vue
index 1bfb25af3c..8b86da9e6c 100644
--- a/packages/editor-ui/src/views/TemplatesWorkflowView.vue
+++ b/packages/editor-ui/src/views/TemplatesWorkflowView.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, onMounted, ref, watch } from 'vue';
-import { setPageTitle } from '@/utils/htmlUtils';
 import { useTemplatesStore } from '@/stores/templates.store';
 import { usePostHog } from '@/stores/posthog.store';
 import { useTemplateWorkflow } from '@/utils/templates/templateActions';
@@ -8,6 +7,7 @@ import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRoute, useRouter } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useI18n } from '@/composables/useI18n';
 import TemplatesView from './TemplatesView.vue';
 
@@ -20,6 +20,7 @@ const route = useRoute();
 const router = useRouter();
 const telemetry = useTelemetry();
 const i18n = useI18n();
+const documentTitle = useDocumentTitle();
 
 const loading = ref(true);
 const showPreview = ref(true);
@@ -63,9 +64,9 @@ watch(
 	() => template.value,
 	(newTemplate) => {
 		if (newTemplate) {
-			setPageTitle(`n8n - Template template: ${newTemplate.name}`);
+			documentTitle.set(`Template template: ${newTemplate.name}`);
 		} else {
-			setPageTitle('n8n - Templates');
+			documentTitle.set('Templates');
 		}
 	},
 );
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index 4e3ea69f1b..475b30fab2 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, ref, onBeforeMount, onBeforeUnmount } from 'vue';
+import { computed, ref, onBeforeMount, onBeforeUnmount, onMounted } from 'vue';
 import { useEnvironmentsStore } from '@/stores/environments.ee.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
@@ -9,6 +9,7 @@ import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { useMessage } from '@/composables/useMessage';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
 
 import type { IResource } from '@/components/layouts/ResourcesListLayout.vue';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
@@ -28,6 +29,7 @@ const telemetry = useTelemetry();
 const i18n = useI18n();
 const message = useMessage();
 const sourceControlStore = useSourceControlStore();
+const documentTitle = useDocumentTitle();
 let sourceControlStoreUnsubscribe = () => {};
 
 const layoutRef = ref<InstanceType<typeof ResourcesListLayout> | null>(null);
@@ -248,6 +250,10 @@ onBeforeMount(() => {
 onBeforeUnmount(() => {
 	sourceControlStoreUnsubscribe();
 });
+
+onMounted(() => {
+	documentTitle.set(i18n.baseText('variables.heading'));
+});
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/views/WorkflowExecutionsView.vue b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
index a9abf67ee4..d5ff4dcb6b 100644
--- a/packages/editor-ui/src/views/WorkflowExecutionsView.vue
+++ b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
@@ -113,7 +113,7 @@ function onDocumentVisibilityChange() {
 async function initializeRoute() {
 	if (route.name === VIEWS.EXECUTION_HOME && executions.value.length > 0 && workflow.value) {
 		await router
-			.push({
+			.replace({
 				name: VIEWS.EXECUTION_PREVIEW,
 				params: { name: workflow.value.id, executionId: executions.value[0].id },
 			})
diff --git a/packages/editor-ui/src/views/WorkflowsView.test.ts b/packages/editor-ui/src/views/WorkflowsView.test.ts
index 226f621ee3..10472afe9c 100644
--- a/packages/editor-ui/src/views/WorkflowsView.test.ts
+++ b/packages/editor-ui/src/views/WorkflowsView.test.ts
@@ -1,109 +1,299 @@
-import { afterAll, beforeAll } from 'vitest';
-import { setActivePinia, createPinia } from 'pinia';
 import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import { setupServer } from '@/__tests__/server';
 import WorkflowsView from '@/views/WorkflowsView.vue';
-import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { createComponentRenderer } from '@/__tests__/render';
 import { useProjectsStore } from '@/stores/projects.store';
+import { createTestingPinia } from '@pinia/testing';
+import { STORES, MORE_ONBOARDING_OPTIONS_EXPERIMENT, VIEWS } from '@/constants';
+import { mockedStore } from '@/__tests__/utils';
+import { usePostHog } from '@/stores/posthog.store';
+import type { Cloud, IUser, IWorkflowDb } from '@/Interface';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import type { Project } from '@/types/projects.types';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useTagsStore } from '@/stores/tags.store';
+import { createRouter, createWebHistory } from 'vue-router';
+import * as usersApi from '@/api/users';
 
-const originalOffsetHeight = Object.getOwnPropertyDescriptor(
-	HTMLElement.prototype,
-	'offsetHeight',
-) as PropertyDescriptor;
+vi.mock('@/api/projects.api');
+vi.mock('@/api/users');
+vi.mock('@/api/sourceControl');
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/:projectId?',
+			component: { template: '<div></div>' },
+		},
+		{
+			path: '/workflow',
+			name: VIEWS.NEW_WORKFLOW,
+			component: { template: '<div></div>' },
+		},
+	],
+});
+
+const renderComponent = createComponentRenderer(WorkflowsView, {
+	global: {
+		plugins: [router],
+	},
+});
+
+const initialState = {
+	[STORES.SETTINGS]: { settings: { enterprise: { sharing: false } } },
+};
 
 describe('WorkflowsView', () => {
-	let server: ReturnType<typeof setupServer>;
-	let pinia: ReturnType<typeof createPinia>;
-	let settingsStore: ReturnType<typeof useSettingsStore>;
-	let usersStore: ReturnType<typeof useUsersStore>;
-	let projectsStore: ReturnType<typeof useProjectsStore>;
-
-	const routerReplaceMock = vi.fn();
-
-	const renderComponent = createComponentRenderer(WorkflowsView, {
-		global: {
-			mocks: {
-				$route: {
-					query: {},
-					params: {},
-				},
-				$router: {
-					replace: routerReplaceMock,
-				},
-			},
-		},
-	});
-
-	beforeAll(() => {
-		Object.defineProperties(HTMLElement.prototype, {
-			offsetHeight: {
-				get() {
-					return this.getAttribute('data-test-id') === 'resources-list' ? 1000 : 100;
-				},
-			},
-		});
-
-		server = setupServer();
-	});
-
-	afterAll(() => {
-		Object.defineProperty(HTMLElement.prototype, 'offsetHeight', originalOffsetHeight);
-	});
-
 	beforeEach(async () => {
-		pinia = createPinia();
-		setActivePinia(pinia);
-
-		settingsStore = useSettingsStore();
-		usersStore = useUsersStore();
-		projectsStore = useProjectsStore();
-
-		vi.spyOn(projectsStore, 'getAllProjects').mockImplementation(async () => {});
-
-		await settingsStore.getSettings();
-		await usersStore.fetchUsers();
-		await usersStore.loginWithCookie();
+		await router.push('/');
+		await router.isReady();
 	});
 
-	afterAll(() => {
-		server.shutdown();
+	describe('should show empty state', () => {
+		it('for non setup user', () => {
+			const { getByRole } = renderComponent({ pinia: createTestingPinia({ initialState }) });
+			expect(getByRole('heading').textContent).toBe('👋 Welcome!');
+		});
+
+		it('for currentUser user', () => {
+			const pinia = createTestingPinia({ initialState });
+			const userStore = mockedStore(useUsersStore);
+			userStore.currentUser = { firstName: 'John' } as IUser;
+			const { getByRole } = renderComponent({ pinia });
+
+			expect(getByRole('heading').textContent).toBe('👋 Welcome John!');
+		});
+
+		describe('when onboardingExperiment -> False', () => {
+			const pinia = createTestingPinia({ initialState });
+			const posthog = mockedStore(usePostHog);
+			const sourceControl = mockedStore(useSourceControlStore);
+			posthog.getVariant.mockReturnValue(MORE_ONBOARDING_OPTIONS_EXPERIMENT.control);
+
+			const projectsStore = mockedStore(useProjectsStore);
+
+			it('for readOnlyEnvironment', () => {
+				sourceControl.preferences.branchReadOnly = true;
+
+				const { getByText } = renderComponent({ pinia });
+				expect(getByText('No workflows here yet')).toBeInTheDocument();
+				sourceControl.preferences.branchReadOnly = false;
+			});
+
+			it('for noPermission', () => {
+				const { getByText } = renderComponent({ pinia });
+				expect(getByText('There are currently no workflows to view')).toBeInTheDocument();
+			});
+
+			it('for user with create scope', () => {
+				projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
+				const { getByText } = renderComponent({ pinia });
+				expect(getByText('Create your first workflow')).toBeInTheDocument();
+			});
+		});
+
+		it('should allow workflow creation', async () => {
+			const pinia = createTestingPinia({ initialState });
+			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
+			const { getByTestId } = renderComponent({ pinia });
+
+			expect(getByTestId('new-workflow-card')).toBeInTheDocument();
+
+			await userEvent.click(getByTestId('new-workflow-card'));
+
+			expect(router.currentRoute.value.name).toBe(VIEWS.NEW_WORKFLOW);
+		});
+
+		describe('should show courses and templates link for sales users', () => {
+			it('for cloudUser', () => {
+				const pinia = createTestingPinia({ initialState });
+				const userStore = mockedStore(useUsersStore);
+				userStore.currentUserCloudInfo = { role: 'Sales' } as Cloud.UserAccount;
+				const projectsStore = mockedStore(useProjectsStore);
+				projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
+				const { getAllByTestId } = renderComponent({ pinia });
+
+				expect(getAllByTestId('browse-sales-templates-card').length).toBe(2);
+			});
+
+			it('for personalizationAnswers', () => {
+				const pinia = createTestingPinia({ initialState });
+				const userStore = mockedStore(useUsersStore);
+				userStore.currentUser = { personalizationAnswers: { role: 'Sales' } } as IUser;
+				const projectsStore = mockedStore(useProjectsStore);
+				projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
+				const { getAllByTestId } = renderComponent({ pinia });
+
+				expect(getAllByTestId('browse-sales-templates-card').length).toBe(2);
+			});
+		});
+
+		it('should show courses and templates link for onboardingExperiment', () => {
+			const pinia = createTestingPinia({ initialState });
+
+			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
+
+			const posthog = mockedStore(usePostHog);
+			posthog.getVariant.mockReturnValue(MORE_ONBOARDING_OPTIONS_EXPERIMENT.variant);
+
+			const { getAllByTestId } = renderComponent({ pinia });
+
+			expect(getAllByTestId('browse-sales-templates-card').length).toBe(2);
+		});
 	});
 
-	it('should filter workflows by tags', async () => {
-		const { getByTestId, getAllByTestId, queryByTestId } = renderComponent({
-			pinia,
+	describe('workflow creation button', () => {
+		it('should create global workflow', async () => {
+			const pushSpy = vi.spyOn(router, 'push');
+			const pinia = createTestingPinia({ initialState });
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.allWorkflows = [{ id: '1' } as IWorkflowDb];
+
+			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.fetchProject.mockResolvedValue({} as Project);
+			projectsStore.personalProject = { scopes: ['workflow:create'] } as Project;
+
+			const { getByTestId } = renderComponent({ pinia });
+			expect(getByTestId('resources-list-add')).toBeInTheDocument();
+
+			expect(getByTestId('resources-list-add').textContent).toBe('Add workflow');
+
+			await userEvent.click(getByTestId('resources-list-add'));
+
+			expect(pushSpy).toHaveBeenCalledWith({ name: VIEWS.NEW_WORKFLOW, query: { projectId: '' } });
 		});
 
-		expect(queryByTestId('resources-list')).not.toBeInTheDocument();
+		it('should create a project specific workflow', async () => {
+			await router.replace({ path: '/project-id' });
+			const pushSpy = vi.spyOn(router, 'push');
 
-		await waitFor(() => {
-			// There are 5 workflows defined in server fixtures
-			expect(getAllByTestId('resources-list-item')).toHaveLength(5);
+			const pinia = createTestingPinia({ initialState });
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.allWorkflows = [{ id: '1' } as IWorkflowDb];
+
+			const projectsStore = mockedStore(useProjectsStore);
+
+			projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
+
+			const { getByTestId } = renderComponent({ pinia });
+			expect(router.currentRoute.value.params.projectId).toBe('project-id');
+
+			expect(getByTestId('resources-list-add')).toBeInTheDocument();
+
+			expect(getByTestId('resources-list-add').textContent).toBe('Add workflow to project');
+
+			await userEvent.click(getByTestId('resources-list-add'));
+
+			expect(pushSpy).toHaveBeenCalledWith({
+				name: VIEWS.NEW_WORKFLOW,
+				query: { projectId: 'project-id' },
+			});
+		});
+	});
+
+	describe('filters', () => {
+		it('should set tag filter based on query parameters', async () => {
+			await router.replace({ query: { tags: 'test-tag' } });
+
+			const pinia = createTestingPinia({ initialState });
+			const tagStore = mockedStore(useTagsStore);
+			tagStore.allTags = [{ id: 'test-tag', name: 'tag' }];
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.allWorkflows = [
+				{ id: '1' },
+				{ id: '2', tags: [{ id: 'test-tag', name: 'tag' }] },
+			] as IWorkflowDb[];
+
+			const { getAllByTestId } = renderComponent({ pinia });
+
+			expect(tagStore.fetchAll).toHaveBeenCalled();
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(1));
 		});
 
-		await userEvent.click(
-			getAllByTestId('resources-list-item')[0].querySelector('.n8n-tag') as HTMLElement,
-		);
-		await waitFor(() => {
-			expect(getAllByTestId('resources-list-item').length).toBeLessThan(5);
-		});
-		expect(routerReplaceMock).toHaveBeenLastCalledWith({ query: { tags: '1' } });
+		it('should set search filter based on query parameters', async () => {
+			await router.replace({ query: { search: 'one' } });
 
-		await userEvent.click(getByTestId('workflows-filter-reset'));
-		await waitFor(() => {
-			expect(getAllByTestId('resources-list-item')).toHaveLength(5);
-		});
-		expect(routerReplaceMock).toHaveBeenLastCalledWith({ query: undefined });
+			const pinia = createTestingPinia({ initialState });
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.allWorkflows = [
+				{ id: '1', name: 'one' },
+				{ id: '2', name: 'two' },
+			] as IWorkflowDb[];
 
-		await userEvent.click(
-			getAllByTestId('resources-list-item')[3].querySelector('.n8n-tag') as HTMLElement,
-		);
-		await waitFor(() => {
-			expect(getAllByTestId('resources-list-item').length).toBeLessThan(5);
+			const { getAllByTestId } = renderComponent({ pinia });
+
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(1));
 		});
-		expect(routerReplaceMock).toHaveBeenLastCalledWith({ query: { tags: '1' } });
+
+		it('should set status filter based on query parameters', async () => {
+			await router.replace({ query: { status: 'true' } });
+
+			const pinia = createTestingPinia({ initialState });
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.allWorkflows = [
+				{ id: '1', active: true },
+				{ id: '2', active: false },
+			] as IWorkflowDb[];
+
+			const { getAllByTestId } = renderComponent({ pinia });
+
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(1));
+		});
+
+		it('should reset filters', async () => {
+			await router.replace({ query: { status: 'true' } });
+
+			const pinia = createTestingPinia({ initialState });
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.allWorkflows = [
+				{ id: '1', active: true },
+				{ id: '2', active: false },
+			] as IWorkflowDb[];
+
+			const { getAllByTestId, getByTestId } = renderComponent({ pinia });
+
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(1));
+			await waitFor(() => expect(getByTestId('workflows-filter-reset')).toBeInTheDocument());
+
+			await userEvent.click(getByTestId('workflows-filter-reset'));
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(2));
+		});
+
+		it('should remove incomplete properties', async () => {
+			await router.replace({ query: { tags: '' } });
+			const pinia = createTestingPinia({ initialState });
+			renderComponent({ pinia });
+			await waitFor(() => expect(router.currentRoute.value.query).toStrictEqual({}));
+		});
+
+		it('should remove invalid tabs', async () => {
+			await router.replace({ query: { tags: 'non-existing-tag' } });
+			const tagStore = mockedStore(useTagsStore);
+			tagStore.allTags = [{ id: 'test-tag', name: 'tag' }];
+			const pinia = createTestingPinia({ initialState });
+			renderComponent({ pinia });
+			await waitFor(() => expect(router.currentRoute.value.query).toStrictEqual({}));
+		});
+	});
+
+	it('should reinitialize on source control pullWorkfolder', async () => {
+		vi.spyOn(usersApi, 'getUsers').mockResolvedValue([]);
+		const pinia = createTestingPinia({ initialState, stubActions: false });
+		const userStore = mockedStore(useUsersStore);
+		const workflowsStore = mockedStore(useWorkflowsStore);
+		workflowsStore.fetchAllWorkflows.mockResolvedValue([]);
+		workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
+
+		const sourceControl = useSourceControlStore();
+
+		renderComponent({ pinia });
+
+		expect(userStore.fetchUsers).toHaveBeenCalledTimes(1);
+		await sourceControl.pullWorkfolder(true);
+		expect(userStore.fetchUsers).toHaveBeenCalledTimes(2);
 	});
 });
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 3bc5a8b914..c629f4e318 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -1,11 +1,10 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed, onMounted, watch, ref } from 'vue';
 import ResourcesListLayout, { type IResource } from '@/components/layouts/ResourcesListLayout.vue';
 import WorkflowCard from '@/components/WorkflowCard.vue';
 import WorkflowTagsDropdown from '@/components/WorkflowTagsDropdown.vue';
 import { EnterpriseEditionFeature, MORE_ONBOARDING_OPTIONS_EXPERIMENT, VIEWS } from '@/constants';
 import type { ITag, IUser, IWorkflowDb } from '@/Interface';
-import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
@@ -17,6 +16,38 @@ import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import { useTemplatesStore } from '@/stores/templates.store';
 import { getResourcePermissions } from '@/permissions';
 import { usePostHog } from '@/stores/posthog.store';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
+import { useI18n } from '@/composables/useI18n';
+import { useRoute, useRouter } from 'vue-router';
+import { useTelemetry } from '@/composables/useTelemetry';
+import {
+	N8nButton,
+	N8nCard,
+	N8nHeading,
+	N8nIcon,
+	N8nInputLabel,
+	N8nOption,
+	N8nSelect,
+	N8nText,
+	N8nTooltip,
+} from 'n8n-design-system';
+import { pickBy } from 'lodash-es';
+
+const i18n = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const sourceControlStore = useSourceControlStore();
+const usersStore = useUsersStore();
+const workflowsStore = useWorkflowsStore();
+const settingsStore = useSettingsStore();
+const posthogStore = usePostHog();
+const projectsStore = useProjectsStore();
+const templatesStore = useTemplatesStore();
+const telemetry = useTelemetry();
+const uiStore = useUIStore();
+const tagsStore = useTagsStore();
+const documentTitle = useDocumentTitle();
 
 interface Filters {
 	search: string;
@@ -31,283 +62,244 @@ const StatusFilter = {
 	ALL: '',
 };
 
-const WorkflowsView = defineComponent({
-	name: 'WorkflowsView',
-	components: {
-		ResourcesListLayout,
-		WorkflowCard,
-		WorkflowTagsDropdown,
-		ProjectTabs,
-	},
-	data() {
-		return {
-			filters: {
-				search: '',
-				homeProject: '',
-				status: StatusFilter.ALL,
-				tags: [],
-			} as Filters,
-			sourceControlStoreUnsubscribe: () => {},
-			loading: false,
-		};
-	},
-	computed: {
-		...mapStores(
-			useSettingsStore,
-			useUIStore,
-			useUsersStore,
-			useWorkflowsStore,
-			useSourceControlStore,
-			useTagsStore,
-			useProjectsStore,
-			useTemplatesStore,
-			usePostHog,
-		),
-		readOnlyEnv(): boolean {
-			return this.sourceControlStore.preferences.branchReadOnly;
-		},
-		currentUser(): IUser {
-			return this.usersStore.currentUser || ({} as IUser);
-		},
-		allWorkflows(): IResource[] {
-			return this.workflowsStore.allWorkflows as IResource[];
-		},
-		isShareable(): boolean {
-			return this.settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing];
-		},
-		statusFilterOptions(): Array<{ label: string; value: string | boolean }> {
-			return [
-				{
-					label: this.$locale.baseText('workflows.filters.status.all'),
-					value: StatusFilter.ALL,
-				},
-				{
-					label: this.$locale.baseText('workflows.filters.status.active'),
-					value: StatusFilter.ACTIVE,
-				},
-				{
-					label: this.$locale.baseText('workflows.filters.status.deactivated'),
-					value: StatusFilter.DEACTIVATED,
-				},
-			];
-		},
-		userRole() {
-			const role = this.usersStore.currentUserCloudInfo?.role;
-
-			if (role) {
-				return role;
-			}
-
-			const answers = this.usersStore.currentUser?.personalizationAnswers;
-			if (answers && 'role' in answers) {
-				return answers.role;
-			}
-
-			return undefined;
-		},
-		isOnboardingExperimentEnabled() {
-			return (
-				this.posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
-				MORE_ONBOARDING_OPTIONS_EXPERIMENT.variant
-			);
-		},
-		isSalesUser() {
-			if (!this.userRole) {
-				return false;
-			}
-			return ['Sales', 'sales-and-marketing'].includes(this.userRole);
-		},
-		addWorkflowButtonText() {
-			return this.projectsStore.currentProject
-				? 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: {
-			deep: true,
-			handler() {
-				this.saveFiltersOnQueryString();
-			},
-		},
-		'$route.params.projectId'() {
-			void this.initialize();
-		},
-	},
-	async mounted() {
-		await this.setFiltersFromQueryString();
-
-		void this.usersStore.showPersonalizationSurvey();
-
-		this.sourceControlStoreUnsubscribe = this.sourceControlStore.$onAction(({ name, after }) => {
-			if (name === 'pullWorkfolder' && after) {
-				after(() => {
-					void this.initialize();
-				});
-			}
-		});
-	},
-	beforeUnmount() {
-		this.sourceControlStoreUnsubscribe();
-	},
-	methods: {
-		onFiltersUpdated(filters: Filters) {
-			this.filters = filters;
-		},
-		addWorkflow() {
-			this.uiStore.nodeViewInitialized = false;
-			void this.$router.push({
-				name: VIEWS.NEW_WORKFLOW,
-				query: { projectId: this.$route?.params?.projectId },
-			});
-
-			this.$telemetry.track('User clicked add workflow button', {
-				source: 'Workflows list',
-			});
-			this.trackEmptyCardClick('blank');
-		},
-		getTemplateRepositoryURL() {
-			return this.templatesStore.websiteTemplateRepositoryURL;
-		},
-		trackEmptyCardClick(option: 'blank' | 'templates' | 'courses') {
-			this.$telemetry.track('User clicked empty page option', {
-				option,
-			});
-			if (option === 'templates' && this.isSalesUser) {
-				this.trackCategoryLinkClick('Sales');
-			}
-		},
-		trackCategoryLinkClick(category: string) {
-			this.$telemetry.track(`User clicked Browse ${category} Templates`, {
-				role: this.usersStore.currentUserCloudInfo?.role,
-				active_workflow_count: this.workflowsStore.activeWorkflows.length,
-			});
-		},
-		async initialize() {
-			this.loading = true;
-			await Promise.all([
-				this.usersStore.fetchUsers(),
-				this.workflowsStore.fetchAllWorkflows(this.$route?.params?.projectId as string | undefined),
-				this.workflowsStore.fetchActiveWorkflows(),
-			]);
-			this.loading = false;
-		},
-		onClickTag(tagId: string) {
-			if (!this.filters.tags.includes(tagId)) {
-				this.filters.tags.push(tagId);
-			}
-		},
-		onFilter(
-			resource: IWorkflowDb,
-			filters: { tags: string[]; search: string; status: string | boolean },
-			matches: boolean,
-		): boolean {
-			if (this.settingsStore.areTagsEnabled && filters.tags.length > 0) {
-				matches =
-					matches &&
-					filters.tags.every((tag) =>
-						(resource.tags as ITag[])?.find((resourceTag) =>
-							typeof resourceTag === 'object'
-								? `${resourceTag.id}` === `${tag}`
-								: `${resourceTag}` === `${tag}`,
-						),
-					);
-			}
-
-			if (filters.status !== '') {
-				matches = matches && resource.active === filters.status;
-			}
-
-			return matches;
-		},
-		saveFiltersOnQueryString() {
-			const query: { [key: string]: string } = {};
-
-			if (this.filters.search) {
-				query.search = this.filters.search;
-			}
-
-			if (typeof this.filters.status !== 'string') {
-				query.status = this.filters.status.toString();
-			}
-
-			if (this.filters.tags.length) {
-				query.tags = this.filters.tags.join(',');
-			}
-
-			if (this.filters.homeProject) {
-				query.homeProject = this.filters.homeProject;
-			}
-
-			void this.$router.replace({
-				query: Object.keys(query).length ? query : undefined,
-			});
-		},
-		isValidProjectId(projectId: string) {
-			return this.projectsStore.projects.some((project) => project.id === projectId);
-		},
-		async setFiltersFromQueryString() {
-			const { tags, status, search, homeProject } = this.$route.query;
-
-			const filtersToApply: { [key: string]: string | string[] | boolean } = {};
-
-			if (homeProject && typeof homeProject === 'string') {
-				await this.projectsStore.getAllProjects();
-				if (this.isValidProjectId(homeProject)) {
-					filtersToApply.homeProject = homeProject;
-				}
-			}
-
-			if (search && typeof search === 'string') {
-				filtersToApply.search = search;
-			}
-
-			if (tags && typeof tags === 'string') {
-				const currentTags = this.tagsStore.allTags.map((tag) => tag.id);
-				const savedTags = tags.split(',').filter((tag) => currentTags.includes(tag));
-				if (savedTags.length) {
-					filtersToApply.tags = savedTags;
-				}
-			}
-
-			if (
-				status &&
-				typeof status === 'string' &&
-				[StatusFilter.ACTIVE.toString(), StatusFilter.DEACTIVATED.toString()].includes(status)
-			) {
-				filtersToApply.status = status === 'true';
-			}
-
-			if (Object.keys(filtersToApply).length) {
-				this.filters = {
-					...this.filters,
-					...filtersToApply,
-				};
-			}
-		},
-	},
+const loading = ref(false);
+const filters = ref<Filters>({
+	search: '',
+	homeProject: '',
+	status: StatusFilter.ALL,
+	tags: [],
 });
 
-export default WorkflowsView;
+const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
+const currentUser = computed(() => usersStore.currentUser ?? ({} as IUser));
+const allWorkflows = computed(() => workflowsStore.allWorkflows as IResource[]);
+const isShareable = computed(
+	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing],
+);
+
+const statusFilterOptions = computed(() => [
+	{
+		label: i18n.baseText('workflows.filters.status.all'),
+		value: StatusFilter.ALL,
+	},
+	{
+		label: i18n.baseText('workflows.filters.status.active'),
+		value: StatusFilter.ACTIVE,
+	},
+	{
+		label: i18n.baseText('workflows.filters.status.deactivated'),
+		value: StatusFilter.DEACTIVATED,
+	},
+]);
+
+const userRole = computed(() => {
+	const role = usersStore.currentUserCloudInfo?.role;
+	if (role) return role;
+
+	const answers = usersStore.currentUser?.personalizationAnswers;
+	if (answers && 'role' in answers) {
+		return answers.role;
+	}
+
+	return undefined;
+});
+
+const isOnboardingExperimentEnabled = computed(() => {
+	return (
+		posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
+		MORE_ONBOARDING_OPTIONS_EXPERIMENT.variant
+	);
+});
+
+const isSalesUser = computed(() => {
+	return ['Sales', 'sales-and-marketing'].includes(userRole.value || '');
+});
+
+const addWorkflowButtonText = computed(() => {
+	return projectsStore.currentProject
+		? i18n.baseText('workflows.project.add')
+		: i18n.baseText('workflows.add');
+});
+
+const projectPermissions = computed(() => {
+	return getResourcePermissions(
+		projectsStore.currentProject?.scopes ?? projectsStore.personalProject?.scopes,
+	);
+});
+
+const emptyListDescription = computed(() => {
+	if (readOnlyEnv.value) {
+		return i18n.baseText('workflows.empty.description.readOnlyEnv');
+	} else if (!projectPermissions.value.workflow.create) {
+		return i18n.baseText('workflows.empty.description.noPermission');
+	} else {
+		return i18n.baseText('workflows.empty.description');
+	}
+});
+
+const onFilter = (
+	resource: IWorkflowDb,
+	newFilters: { tags: string[]; search: string; status: string | boolean },
+	matches: boolean,
+): boolean => {
+	if (settingsStore.areTagsEnabled && newFilters.tags.length > 0) {
+		matches =
+			matches &&
+			newFilters.tags.every((tag) =>
+				(resource.tags as ITag[])?.find((resourceTag) =>
+					typeof resourceTag === 'object'
+						? `${resourceTag.id}` === `${tag}`
+						: `${resourceTag}` === `${tag}`,
+				),
+			);
+	}
+
+	if (newFilters.status !== '') {
+		matches = matches && resource.active === newFilters.status;
+	}
+
+	return matches;
+};
+
+// Methods
+const onFiltersUpdated = (newFilters: Filters) => {
+	Object.assign(filters.value, newFilters);
+};
+
+const addWorkflow = () => {
+	uiStore.nodeViewInitialized = false;
+	void router.push({
+		name: VIEWS.NEW_WORKFLOW,
+		query: { projectId: route.params?.projectId },
+	});
+
+	telemetry.track('User clicked add workflow button', {
+		source: 'Workflows list',
+	});
+	trackEmptyCardClick('blank');
+};
+
+const getTemplateRepositoryURL = () => templatesStore.websiteTemplateRepositoryURL;
+
+const trackEmptyCardClick = (option: 'blank' | 'templates' | 'courses') => {
+	telemetry.track('User clicked empty page option', {
+		option,
+	});
+	if (option === 'templates' && isSalesUser.value) {
+		trackCategoryLinkClick('Sales');
+	}
+};
+
+const trackCategoryLinkClick = (category: string) => {
+	telemetry.track(`User clicked Browse ${category} Templates`, {
+		role: usersStore.currentUserCloudInfo?.role,
+		active_workflow_count: workflowsStore.activeWorkflows.length,
+	});
+};
+
+const initialize = async () => {
+	loading.value = true;
+	await Promise.all([
+		usersStore.fetchUsers(),
+		workflowsStore.fetchAllWorkflows(route.params?.projectId as string | undefined),
+		workflowsStore.fetchActiveWorkflows(),
+	]);
+	loading.value = false;
+};
+
+const onClickTag = (tagId: string) => {
+	if (!filters.value.tags.includes(tagId)) {
+		filters.value.tags.push(tagId);
+	}
+};
+
+const saveFiltersOnQueryString = () => {
+	const query: { [key: string]: string } = {};
+
+	if (filters.value.search) {
+		query.search = filters.value.search;
+	}
+
+	if (typeof filters.value.status !== 'string') {
+		query.status = filters.value.status.toString();
+	}
+
+	if (filters.value.tags.length) {
+		query.tags = filters.value.tags.join(',');
+	}
+
+	if (filters.value.homeProject) {
+		query.homeProject = filters.value.homeProject;
+	}
+
+	void router.replace({
+		query: Object.keys(query).length ? query : undefined,
+	});
+};
+
+function isValidProjectId(projectId: string) {
+	return projectsStore.availableProjects.some((project) => project.id === projectId);
+}
+
+const setFiltersFromQueryString = async () => {
+	const { tags, status, search, homeProject } = route.query ?? {};
+
+	const filtersToApply: { [key: string]: string | string[] | boolean } = {};
+
+	if (homeProject && typeof homeProject === 'string') {
+		await projectsStore.getAvailableProjects();
+		if (isValidProjectId(homeProject)) {
+			filtersToApply.homeProject = homeProject;
+		}
+	}
+
+	if (search && typeof search === 'string') {
+		filtersToApply.search = search;
+	}
+
+	if (tags && typeof tags === 'string') {
+		await tagsStore.fetchAll();
+		const currentTags = tagsStore.allTags.map((tag) => tag.id);
+
+		filtersToApply.tags = tags.split(',').filter((tag) => currentTags.includes(tag));
+	}
+
+	if (
+		status &&
+		typeof status === 'string' &&
+		[StatusFilter.ACTIVE.toString(), StatusFilter.DEACTIVATED.toString()].includes(status)
+	) {
+		filtersToApply.status = status === 'true';
+	}
+
+	if (Object.keys(filtersToApply).length) {
+		Object.assign(filters.value, filtersToApply);
+	}
+
+	void router.replace({ query: pickBy(route.query) });
+};
+
+sourceControlStore.$onAction(({ name, after }) => {
+	if (name !== 'pullWorkfolder') return;
+	after(async () => await initialize());
+});
+
+watch(filters, () => saveFiltersOnQueryString(), { deep: true });
+
+watch(
+	() => route.params?.projectId,
+	async () => await initialize(),
+);
+
+onMounted(async () => {
+	documentTitle.set(i18n.baseText('workflows.heading'));
+	await setFiltersFromQueryString();
+	void usersStore.showPersonalizationSurvey();
+});
 </script>
 
 <template>
 	<ResourcesListLayout
-		ref="layout"
 		resource-key="workflows"
 		:resources="allWorkflows"
 		:filters="filters"
@@ -324,9 +316,9 @@ export default WorkflowsView;
 			<ProjectTabs />
 		</template>
 		<template #add-button="{ disabled }">
-			<n8n-tooltip :disabled="!readOnlyEnv">
+			<N8nTooltip :disabled="!readOnlyEnv">
 				<div>
-					<n8n-button
+					<N8nButton
 						size="large"
 						block
 						:disabled="disabled"
@@ -334,18 +326,18 @@ export default WorkflowsView;
 						@click="addWorkflow"
 					>
 						{{ addWorkflowButtonText }}
-					</n8n-button>
+					</N8nButton>
 				</div>
 				<template #content>
 					<i18n-t tag="span" keypath="mainSidebar.workflows.readOnlyEnv.tooltip">
 						<template #link>
 							<a target="_blank" href="https://docs.n8n.io/source-control-environments/">
-								{{ $locale.baseText('mainSidebar.workflows.readOnlyEnv.tooltip.link') }}
+								{{ i18n.baseText('mainSidebar.workflows.readOnlyEnv.tooltip.link') }}
 							</a>
 						</template>
 					</i18n-t>
 				</template>
-			</n8n-tooltip>
+			</N8nTooltip>
 		</template>
 		<template #default="{ data, updateItemSize }">
 			<WorkflowCard
@@ -359,50 +351,50 @@ export default WorkflowsView;
 		</template>
 		<template #empty>
 			<div class="text-center mt-s">
-				<n8n-heading tag="h2" size="xlarge" class="mb-2xs">
+				<N8nHeading tag="h2" size="xlarge" class="mb-2xs">
 					{{
 						currentUser.firstName
-							? $locale.baseText('workflows.empty.heading', {
+							? i18n.baseText('workflows.empty.heading', {
 									interpolate: { name: currentUser.firstName },
 								})
-							: $locale.baseText('workflows.empty.heading.userNotSetup')
+							: i18n.baseText('workflows.empty.heading.userNotSetup')
 					}}
-				</n8n-heading>
-				<n8n-text v-if="!isOnboardingExperimentEnabled" size="large" color="text-base">
+				</N8nHeading>
+				<N8nText v-if="!isOnboardingExperimentEnabled" size="large" color="text-base">
 					{{ emptyListDescription }}
-				</n8n-text>
+				</N8nText>
 			</div>
 			<div
 				v-if="!readOnlyEnv && projectPermissions.workflow.create"
 				:class="['text-center', 'mt-2xl', $style.actionsContainer]"
 			>
-				<n8n-card
+				<N8nCard
 					:class="$style.emptyStateCard"
 					hoverable
 					data-test-id="new-workflow-card"
 					@click="addWorkflow"
 				>
-					<n8n-icon :class="$style.emptyStateCardIcon" icon="file" />
-					<n8n-text size="large" class="mt-xs" color="text-dark">
-						{{ $locale.baseText('workflows.empty.startFromScratch') }}
-					</n8n-text>
-				</n8n-card>
+					<N8nIcon :class="$style.emptyStateCardIcon" icon="file" />
+					<N8nText size="large" class="mt-xs" color="text-dark">
+						{{ i18n.baseText('workflows.empty.startFromScratch') }}
+					</N8nText>
+				</N8nCard>
 				<a
 					v-if="isSalesUser || isOnboardingExperimentEnabled"
 					href="https://docs.n8n.io/courses/#available-courses"
 					:class="$style.emptyStateCard"
 					target="_blank"
 				>
-					<n8n-card
+					<N8nCard
 						hoverable
 						data-test-id="browse-sales-templates-card"
 						@click="trackEmptyCardClick('courses')"
 					>
-						<n8n-icon :class="$style.emptyStateCardIcon" icon="graduation-cap" />
-						<n8n-text size="large" class="mt-xs" color="text-dark">
-							{{ $locale.baseText('workflows.empty.learnN8n') }}
-						</n8n-text>
-					</n8n-card>
+						<N8nIcon :class="$style.emptyStateCardIcon" icon="graduation-cap" />
+						<N8nText size="large" class="mt-xs" color="text-dark">
+							{{ i18n.baseText('workflows.empty.learnN8n') }}
+						</N8nText>
+					</N8nCard>
 				</a>
 				<a
 					v-if="isSalesUser || isOnboardingExperimentEnabled"
@@ -410,57 +402,57 @@ export default WorkflowsView;
 					:class="$style.emptyStateCard"
 					target="_blank"
 				>
-					<n8n-card
+					<N8nCard
 						hoverable
 						data-test-id="browse-sales-templates-card"
 						@click="trackEmptyCardClick('templates')"
 					>
-						<n8n-icon :class="$style.emptyStateCardIcon" icon="box-open" />
-						<n8n-text size="large" class="mt-xs" color="text-dark">
-							{{ $locale.baseText('workflows.empty.browseTemplates') }}
-						</n8n-text>
-					</n8n-card>
+						<N8nIcon :class="$style.emptyStateCardIcon" icon="box-open" />
+						<N8nText size="large" class="mt-xs" color="text-dark">
+							{{ i18n.baseText('workflows.empty.browseTemplates') }}
+						</N8nText>
+					</N8nCard>
 				</a>
 			</div>
 		</template>
 		<template #filters="{ setKeyValue }">
 			<div v-if="settingsStore.areTagsEnabled" class="mb-s">
-				<n8n-input-label
-					:label="$locale.baseText('workflows.filters.tags')"
+				<N8nInputLabel
+					:label="i18n.baseText('workflows.filters.tags')"
 					:bold="false"
 					size="small"
 					color="text-base"
 					class="mb-3xs"
 				/>
 				<WorkflowTagsDropdown
-					:placeholder="$locale.baseText('workflowOpen.filterWorkflows')"
+					:placeholder="i18n.baseText('workflowOpen.filterWorkflows')"
 					:model-value="filters.tags"
 					:create-enabled="false"
 					@update:model-value="setKeyValue('tags', $event)"
 				/>
 			</div>
 			<div class="mb-s">
-				<n8n-input-label
-					:label="$locale.baseText('workflows.filters.status')"
+				<N8nInputLabel
+					:label="i18n.baseText('workflows.filters.status')"
 					:bold="false"
 					size="small"
 					color="text-base"
 					class="mb-3xs"
 				/>
-				<n8n-select
+				<N8nSelect
 					data-test-id="status-dropdown"
 					:model-value="filters.status"
 					@update:model-value="setKeyValue('status', $event)"
 				>
-					<n8n-option
+					<N8nOption
 						v-for="option in statusFilterOptions"
 						:key="option.label"
 						:label="option.label"
 						:value="option.value"
 						data-test-id="status"
 					>
-					</n8n-option>
-				</n8n-select>
+					</N8nOption>
+				</N8nSelect>
 			</div>
 		</template>
 	</ResourcesListLayout>
diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts
index 80972dcd33..f7d81cc3cf 100644
--- a/packages/editor-ui/vite.config.mts
+++ b/packages/editor-ui/vite.config.mts
@@ -3,41 +3,11 @@ import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
 import { sentryVitePlugin } from '@sentry/vite-plugin';
 
-import packageJSON from './package.json';
 import { vitestConfig } from '../design-system/vite.config.mts';
 import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
 import components from 'unplugin-vue-components/vite';
 
-const vendorChunks = ['vue', 'vue-router'];
-const n8nChunks = ['n8n-workflow', 'n8n-design-system', '@n8n/chat'];
-const ignoreChunks = [
-	'@fontsource/open-sans',
-	'@vueuse/components',
-	// TODO: remove this. It's currently required by xml2js in NodeErrors
-	'stream-browserify',
-	'vue-markdown-render',
-];
-
-const isScopedPackageToIgnore = (str: string) => /@codemirror\//.test(str);
-
-function renderChunks() {
-	const { dependencies } = packageJSON;
-	const chunks: Record<string, string[]> = {};
-
-	Object.keys(dependencies).forEach((key) => {
-		if ([...vendorChunks, ...n8nChunks, ...ignoreChunks].includes(key)) {
-			return;
-		}
-
-		if (isScopedPackageToIgnore(key)) return;
-
-		chunks[key] = [key];
-	});
-
-	return chunks;
-}
-
 const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/';
 
 const { NODE_ENV } = process.env;
@@ -124,19 +94,8 @@ export default mergeConfig(
 			},
 		},
 		build: {
-			assetsInlineLimit: 0,
 			minify: !!release,
 			sourcemap: !!release,
-			rollupOptions: {
-				treeshake: !!release,
-				output: {
-					manualChunks: {
-						vendor: vendorChunks,
-						n8n: n8nChunks,
-						...renderChunks(),
-					},
-				},
-			},
 		},
 	}),
 	vitestConfig,
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 2de9ea2a7f..80c0dd4f56 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.61.0",
+  "version": "1.63.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/credentials/IterableApi.credentials.ts b/packages/nodes-base/credentials/IterableApi.credentials.ts
index ba0e9a0104..0b19b8226e 100644
--- a/packages/nodes-base/credentials/IterableApi.credentials.ts
+++ b/packages/nodes-base/credentials/IterableApi.credentials.ts
@@ -1,4 +1,9 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
 
 export class IterableApi implements ICredentialType {
 	name = 'iterableApi';
@@ -15,5 +20,38 @@ export class IterableApi implements ICredentialType {
 			typeOptions: { password: true },
 			default: '',
 		},
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: [
+				{
+					name: 'EDC',
+					value: 'https://api.eu.iterable.com',
+				},
+				{
+					name: 'USDC',
+					value: 'https://api.iterable.com',
+				},
+			],
+			default: 'https://api.iterable.com',
+		},
 	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Api_Key: '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials?.region}}',
+			url: '/api/webhooks',
+			method: 'GET',
+		},
+	};
 }
diff --git a/packages/nodes-base/credentials/SysdigApi.credentials.ts b/packages/nodes-base/credentials/SysdigApi.credentials.ts
new file mode 100644
index 0000000000..070251df10
--- /dev/null
+++ b/packages/nodes-base/credentials/SysdigApi.credentials.ts
@@ -0,0 +1,36 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class SysdigApi implements ICredentialType {
+	name = 'sysdigApi';
+
+	displayName = 'Sysdig API';
+
+	documentationUrl = 'sysdig';
+
+	icon = { light: 'file:icons/Sysdig.Black.svg', dark: 'file:icons/Sysdig.White.svg' } as const;
+
+	httpRequestNode = {
+		name: 'Sysdig',
+		docsUrl: 'https://docs.sysdig.com/en/docs/developer-tools/sysdig-api/',
+		apiBaseUrl: 'https://app.us1.sysdig.com',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.accessToken}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/icons/Sysdig.Black.svg b/packages/nodes-base/credentials/icons/Sysdig.Black.svg
new file mode 100644
index 0000000000..4ddf73a371
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Sysdig.Black.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 914 285" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,27,-516.569)">
+        <g transform="matrix(1,0,0,1,48,258.555)">
+            <g transform="matrix(3.3098,0,0,2.3938,3.39912,300.975)">
+                <rect id="Artboard1" x="-23.687" y="-17.947" width="276.15" height="119" style="fill:none;"/>
+                <g transform="matrix(1.406,0,0,1.94401,-100.713,-73.9948)">
+                    <g id="Artboard11" serif:id="Artboard1">
+                        <g>
+                            <g id="ef34e798-518f-4388-ac79-8e481fcb331f">
+                                <path d="M98.358,65.739C98.517,68.39 97.361,70.956 95.271,72.594C93.043,74.164 90.351,74.938 87.63,74.792C83.25,74.81 78.996,73.311 75.594,70.553L78.996,65.32C82.065,67.553 85.013,68.669 87.84,68.669C90.072,68.669 91.188,67.971 91.189,66.576L91.189,66.471C91.189,65.704 90.613,65.059 89.462,64.535C89.043,64.361 87.683,63.925 85.38,63.227C79.798,61.587 77.007,58.779 77.007,54.802L77.007,54.697C76.915,52.144 78.043,49.693 80.042,48.103C82.103,46.51 84.661,45.694 87.264,45.801C91.001,45.791 94.653,46.924 97.73,49.045L94.695,54.54C91.729,52.796 89.2,51.924 87.107,51.923C85.153,51.923 84.176,52.569 84.176,53.859L84.176,53.964C84.176,54.663 84.752,55.291 85.903,55.848C86.356,56.057 87.682,56.546 89.881,57.313C91.912,57.916 93.837,58.835 95.584,60.035C97.355,61.344 98.389,63.431 98.358,65.634L98.358,65.739ZM117.701,74.949C116.619,77.844 115.415,79.868 114.09,81.019C112.501,82.27 110.51,82.902 108.491,82.798C106.004,82.805 103.562,82.136 101.426,80.862L104.095,75.106C105.108,75.774 106.284,76.153 107.496,76.205C108.709,76.231 109.818,75.499 110.27,74.373L99.281,46.219L107.706,46.219L114.09,65.32L120.213,46.219L128.481,46.219L117.701,74.949ZM150.889,65.739C151.048,68.39 149.892,70.956 147.802,72.594C145.575,74.164 142.882,74.938 140.162,74.792C135.782,74.81 131.528,73.311 128.126,70.553L131.527,65.32C134.597,67.553 137.545,68.669 140.371,68.669C142.603,68.669 143.72,67.971 143.72,66.576L143.72,66.471C143.72,65.704 143.144,65.059 141.993,64.535C141.574,64.361 140.214,63.925 137.911,63.227C132.329,61.587 129.538,58.779 129.539,54.802L129.539,54.697C129.446,52.144 130.574,49.693 132.574,48.103C134.634,46.51 137.193,45.694 139.795,45.801C143.532,45.791 147.185,46.924 150.261,49.045L147.226,54.54C144.26,52.796 141.731,51.924 139.638,51.923C137.684,51.923 136.707,52.569 136.708,53.859L136.708,53.964C136.708,54.663 137.283,55.291 138.435,55.848C138.888,56.057 140.213,56.546 142.412,57.313C144.444,57.916 146.369,58.835 148.116,60.034C149.887,61.344 150.921,63.432 150.889,65.634L150.889,65.739ZM175.16,74.269L175.16,71.809C172.728,73.868 169.605,74.934 166.421,74.792C163.083,74.855 159.869,73.504 157.577,71.076C154.961,68.355 153.653,64.762 153.653,60.296L153.653,60.191C153.653,55.726 154.943,52.133 157.525,49.412C159.833,46.977 163.066,45.626 166.421,45.696C169.542,45.584 172.615,46.504 175.16,48.313L175.16,36.067L183.115,36.067L183.115,74.269L175.16,74.269ZM175.265,60.192C175.343,58.14 174.631,56.135 173.277,54.592C172.07,53.2 170.304,52.413 168.462,52.447C166.63,52.409 164.87,53.175 163.648,54.54C162.257,56.085 161.525,58.114 161.607,60.191L161.607,60.296C161.531,62.357 162.263,64.368 163.648,65.896C164.875,67.261 166.627,68.041 168.462,68.041C170.298,68.041 172.049,67.261 173.277,65.896C174.631,64.353 175.343,62.348 175.265,60.296L175.265,60.192ZM187.929,43.132L187.929,36.067L196.302,36.067L196.302,43.132L187.929,43.132ZM188.138,74.269L188.138,46.22L196.093,46.22L196.093,74.269L188.138,74.269ZM230.382,67.937C230.382,73.135 229.074,76.921 226.457,79.292C223.945,81.595 220.038,82.746 214.735,82.746C210.423,82.808 206.162,81.801 202.333,79.816L205.054,73.327C207.933,74.994 211.199,75.878 214.526,75.891C219.864,75.891 222.532,73.693 222.533,69.297L222.533,68.983C219.917,71.006 216.68,72.061 213.375,71.966C210.14,72.052 207.004,70.824 204.688,68.565C202.131,66.01 200.762,62.494 200.92,58.883L200.92,58.779C200.764,55.158 202.154,51.636 204.74,49.098C207.04,46.845 210.157,45.617 213.375,45.696C216.589,45.616 219.751,46.53 222.428,48.313L222.428,46.22L230.382,46.22L230.382,67.937ZM222.533,58.779C222.582,57.011 221.854,55.308 220.544,54.121C217.772,51.691 213.583,51.691 210.811,54.121C209.528,55.323 208.822,57.021 208.874,58.779L208.874,58.883C208.814,60.657 209.52,62.374 210.811,63.593C212.14,64.794 213.886,65.433 215.677,65.372C217.477,65.43 219.229,64.771 220.544,63.541C221.855,62.354 222.582,60.651 222.533,58.883L222.533,58.779Z" style="fill-rule:nonzero;"/>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/Sysdig.White.svg b/packages/nodes-base/credentials/icons/Sysdig.White.svg
new file mode 100644
index 0000000000..381e42673e
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Sysdig.White.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 914 285" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,27,-23.569)">
+        <g transform="matrix(1,0,0,1,48,-234.445)">
+            <g transform="matrix(3.3098,0,0,2.3938,3.39912,300.975)">
+                <rect id="Artboard1" x="-23.687" y="-17.947" width="276.15" height="119" style="fill:none;"/>
+                <g transform="matrix(1.406,0,0,1.94401,-100.713,-73.9948)">
+                    <g id="Artboard11" serif:id="Artboard1">
+                        <g>
+                            <g id="ef34e798-518f-4388-ac79-8e481fcb331f">
+                                <path d="M98.358,65.739C98.517,68.39 97.361,70.956 95.271,72.594C93.043,74.164 90.351,74.938 87.63,74.792C83.25,74.81 78.996,73.311 75.594,70.553L78.996,65.32C82.065,67.553 85.013,68.669 87.84,68.669C90.072,68.669 91.188,67.971 91.189,66.576L91.189,66.471C91.189,65.704 90.613,65.059 89.462,64.535C89.043,64.361 87.683,63.925 85.38,63.227C79.798,61.587 77.007,58.779 77.007,54.802L77.007,54.697C76.915,52.144 78.043,49.693 80.042,48.103C82.103,46.51 84.661,45.694 87.264,45.801C91.001,45.791 94.653,46.924 97.73,49.045L94.695,54.54C91.729,52.796 89.2,51.924 87.107,51.923C85.153,51.923 84.176,52.569 84.176,53.859L84.176,53.964C84.176,54.663 84.752,55.291 85.903,55.848C86.356,56.057 87.682,56.546 89.881,57.313C91.912,57.916 93.837,58.835 95.584,60.035C97.355,61.344 98.389,63.431 98.358,65.634L98.358,65.739ZM117.701,74.949C116.619,77.844 115.415,79.868 114.09,81.019C112.501,82.27 110.51,82.902 108.491,82.798C106.004,82.805 103.562,82.136 101.426,80.862L104.095,75.106C105.108,75.774 106.284,76.153 107.496,76.205C108.709,76.231 109.818,75.499 110.27,74.373L99.281,46.219L107.706,46.219L114.09,65.32L120.213,46.219L128.481,46.219L117.701,74.949ZM150.889,65.739C151.048,68.39 149.892,70.956 147.802,72.594C145.575,74.164 142.882,74.938 140.162,74.792C135.782,74.81 131.528,73.311 128.126,70.553L131.527,65.32C134.597,67.553 137.545,68.669 140.371,68.669C142.603,68.669 143.72,67.971 143.72,66.576L143.72,66.471C143.72,65.704 143.144,65.059 141.993,64.535C141.574,64.361 140.214,63.925 137.911,63.227C132.329,61.587 129.538,58.779 129.539,54.802L129.539,54.697C129.446,52.144 130.574,49.693 132.574,48.103C134.634,46.51 137.193,45.694 139.795,45.801C143.532,45.791 147.185,46.924 150.261,49.045L147.226,54.54C144.26,52.796 141.731,51.924 139.638,51.923C137.684,51.923 136.707,52.569 136.708,53.859L136.708,53.964C136.708,54.663 137.283,55.291 138.435,55.848C138.888,56.057 140.213,56.546 142.412,57.313C144.444,57.916 146.369,58.835 148.116,60.034C149.887,61.344 150.921,63.432 150.889,65.634L150.889,65.739ZM175.16,74.269L175.16,71.809C172.728,73.868 169.605,74.934 166.421,74.792C163.083,74.855 159.869,73.504 157.577,71.076C154.961,68.355 153.653,64.762 153.653,60.296L153.653,60.191C153.653,55.726 154.943,52.133 157.525,49.412C159.833,46.977 163.066,45.626 166.421,45.696C169.542,45.584 172.615,46.504 175.16,48.313L175.16,36.067L183.115,36.067L183.115,74.269L175.16,74.269ZM175.265,60.192C175.343,58.14 174.631,56.135 173.277,54.592C172.07,53.2 170.304,52.413 168.462,52.447C166.63,52.409 164.87,53.175 163.648,54.54C162.257,56.085 161.525,58.114 161.607,60.191L161.607,60.296C161.531,62.357 162.263,64.368 163.648,65.896C164.875,67.261 166.627,68.041 168.462,68.041C170.298,68.041 172.049,67.261 173.277,65.896C174.631,64.353 175.343,62.348 175.265,60.296L175.265,60.192ZM187.929,43.132L187.929,36.067L196.302,36.067L196.302,43.132L187.929,43.132ZM188.138,74.269L188.138,46.22L196.093,46.22L196.093,74.269L188.138,74.269ZM230.382,67.937C230.382,73.135 229.074,76.921 226.457,79.292C223.945,81.595 220.038,82.746 214.735,82.746C210.423,82.808 206.162,81.801 202.333,79.816L205.054,73.327C207.933,74.994 211.199,75.878 214.526,75.891C219.864,75.891 222.532,73.693 222.533,69.297L222.533,68.983C219.917,71.006 216.68,72.061 213.375,71.966C210.14,72.052 207.004,70.824 204.688,68.565C202.131,66.01 200.762,62.494 200.92,58.883L200.92,58.779C200.764,55.158 202.154,51.636 204.74,49.098C207.04,46.845 210.157,45.617 213.375,45.696C216.589,45.616 219.751,46.53 222.428,48.313L222.428,46.22L230.382,46.22L230.382,67.937ZM222.533,58.779C222.582,57.011 221.854,55.308 220.544,54.121C217.772,51.691 213.583,51.691 210.811,54.121C209.528,55.323 208.822,57.021 208.874,58.779L208.874,58.883C208.814,60.657 209.52,62.374 210.811,63.593C212.14,64.794 213.886,65.433 215.677,65.372C217.477,65.43 219.229,64.771 220.544,63.541C221.855,62.354 222.582,60.651 222.533,58.883L222.533,58.779Z" style="fill:white;fill-rule:nonzero;"/>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
index ac68f13f0e..3741fc980e 100644
--- a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
@@ -114,7 +114,7 @@ export class AiTransform implements INodeType {
 			context.items = context.$input.all();
 
 			const Sandbox = JavaScriptSandbox;
-			const sandbox = new Sandbox(context, code, index, this.helpers);
+			const sandbox = new Sandbox(context, code, this.helpers);
 			sandbox.on(
 				'output',
 				workflowMode === 'manual'
diff --git a/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
index 1fe3e9d0c5..4395f690eb 100644
--- a/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
@@ -16,6 +16,7 @@ export class AirtableV2 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
index 7c526bfa82..f9b5287f4b 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
@@ -54,7 +54,7 @@ export const description: INodeProperties[] = [
 				action: 'Update record',
 			},
 		],
-		default: 'read',
+		default: 'get',
 		displayOptions: {
 			show: {
 				resource: ['record'],
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
index dd2b840d8b..34cdef556a 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -216,7 +216,7 @@ export class AwsS3V2 implements INodeType {
 						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
 						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 						const returnAll = this.getNodeParameter('returnAll', 0);
-						const additionalFields = this.getNodeParameter('additionalFields', 0);
+						const additionalFields = this.getNodeParameter('additionalFields', i);
 
 						if (additionalFields.prefix) {
 							qs.prefix = additionalFields.prefix as string;
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.ts b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
index 803a5710fe..bb378a97da 100644
--- a/packages/nodes-base/nodes/Baserow/Baserow.node.ts
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
@@ -41,6 +41,7 @@ export class Baserow implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'baserowApi',
diff --git a/packages/nodes-base/nodes/Code/Code.node.ts b/packages/nodes-base/nodes/Code/Code.node.ts
index cf94916589..e1230b0786 100644
--- a/packages/nodes-base/nodes/Code/Code.node.ts
+++ b/packages/nodes-base/nodes/Code/Code.node.ts
@@ -1,3 +1,5 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import set from 'lodash/set';
 import {
 	NodeConnectionType,
 	type CodeExecutionMode,
@@ -7,10 +9,12 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-import set from 'lodash/set';
+import Container from 'typedi';
+
 import { javascriptCodeDescription } from './descriptions/JavascriptCodeDescription';
 import { pythonCodeDescription } from './descriptions/PythonCodeDescription';
 import { JavaScriptSandbox } from './JavaScriptSandbox';
+import { JsTaskRunnerSandbox } from './JsTaskRunnerSandbox';
 import { PythonSandbox } from './PythonSandbox';
 import { getSandboxContext } from './Sandbox';
 import { standardizeOutput } from './utils';
@@ -92,6 +96,8 @@ export class Code implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions) {
+		const runnersConfig = Container.get(TaskRunnersConfig);
+
 		const nodeMode = this.getNodeParameter('mode', 0) as CodeExecutionMode;
 		const workflowMode = this.getMode();
 
@@ -102,8 +108,18 @@ export class Code implements INodeType {
 				: 'javaScript';
 		const codeParameterName = language === 'python' ? 'pythonCode' : 'jsCode';
 
+		if (!runnersConfig.disabled && language === 'javaScript') {
+			const code = this.getNodeParameter(codeParameterName, 0) as string;
+			const sandbox = new JsTaskRunnerSandbox(code, nodeMode, workflowMode, this);
+
+			return nodeMode === 'runOnceForAllItems'
+				? [await sandbox.runCodeAllItems()]
+				: [await sandbox.runCodeForEachItem()];
+		}
+
 		const getSandbox = (index = 0) => {
 			const code = this.getNodeParameter(codeParameterName, index) as string;
+
 			const context = getSandboxContext.call(this, index);
 			if (nodeMode === 'runOnceForAllItems') {
 				context.items = context.$input.all();
@@ -112,7 +128,7 @@ export class Code implements INodeType {
 			}
 
 			const Sandbox = language === 'python' ? PythonSandbox : JavaScriptSandbox;
-			const sandbox = new Sandbox(context, code, index, this.helpers);
+			const sandbox = new Sandbox(context, code, this.helpers);
 			sandbox.on(
 				'output',
 				workflowMode === 'manual'
@@ -161,7 +177,7 @@ export class Code implements INodeType {
 			const sandbox = getSandbox(index);
 			let result: INodeExecutionData | undefined;
 			try {
-				result = await sandbox.runCodeEachItem();
+				result = await sandbox.runCodeEachItem(index);
 			} catch (error) {
 				if (!this.continueOnFail()) {
 					set(error, 'node', node);
diff --git a/packages/nodes-base/nodes/Code/ExecutionError.ts b/packages/nodes-base/nodes/Code/ExecutionError.ts
index de7b46ff4d..e1fdffc0b6 100644
--- a/packages/nodes-base/nodes/Code/ExecutionError.ts
+++ b/packages/nodes-base/nodes/Code/ExecutionError.ts
@@ -11,7 +11,7 @@ export class ExecutionError extends ApplicationError {
 
 	lineNumber: number | undefined = undefined;
 
-	constructor(error: Error & { stack: string }, itemIndex?: number) {
+	constructor(error: Error & { stack?: string }, itemIndex?: number) {
 		super(error.message);
 		this.itemIndex = itemIndex;
 
@@ -19,7 +19,7 @@ export class ExecutionError extends ApplicationError {
 			this.context = { itemIndex: this.itemIndex };
 		}
 
-		this.stack = error.stack;
+		this.stack = error.stack ?? '';
 
 		this.populateFromStack();
 	}
diff --git a/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
index 6c9401eb56..73f5ba7f75 100644
--- a/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
+++ b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
@@ -5,6 +5,11 @@ import { ValidationError } from './ValidationError';
 import { ExecutionError } from './ExecutionError';
 import type { SandboxContext } from './Sandbox';
 import { Sandbox } from './Sandbox';
+import {
+	mapItemNotDefinedErrorIfNeededForRunForEach,
+	mapItemsNotDefinedErrorIfNeededForRunForAll,
+	validateNoDisallowedMethodsInRunForEach,
+} from './JsCodeValidator';
 
 const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } =
 	process.env;
@@ -25,7 +30,6 @@ export class JavaScriptSandbox extends Sandbox {
 	constructor(
 		context: SandboxContext,
 		private jsCode: string,
-		itemIndex: number | undefined,
 		helpers: IExecuteFunctions['helpers'],
 		options?: { resolver?: Resolver },
 	) {
@@ -36,7 +40,6 @@ export class JavaScriptSandbox extends Sandbox {
 					plural: 'objects',
 				},
 			},
-			itemIndex,
 			helpers,
 		);
 		this.vm = new NodeVM({
@@ -49,10 +52,10 @@ export class JavaScriptSandbox extends Sandbox {
 		this.vm.on('console.log', (...args: unknown[]) => this.emit('output', ...args));
 	}
 
-	async runCode(): Promise<unknown> {
+	async runCode<T = unknown>(): Promise<T> {
 		const script = `module.exports = async function() {${this.jsCode}\n}()`;
 		try {
-			const executionResult = await this.vm.run(script, __dirname);
+			const executionResult = (await this.vm.run(script, __dirname)) as T;
 			return executionResult;
 		} catch (error) {
 			throw new ExecutionError(error);
@@ -70,10 +73,7 @@ export class JavaScriptSandbox extends Sandbox {
 			executionResult = await this.vm.run(script, __dirname);
 		} catch (error) {
 			// anticipate user expecting `items` to pre-exist as in Function Item node
-			if (error.message === 'items is not defined' && !/(let|const|var) items =/.test(script)) {
-				const quoted = error.message.replace('items', '`items`');
-				error.message = (quoted as string) + '. Did you mean `$input.all()`?';
-			}
+			mapItemsNotDefinedErrorIfNeededForRunForAll(this.jsCode, error);
 
 			throw new ExecutionError(error);
 		}
@@ -87,7 +87,6 @@ export class JavaScriptSandbox extends Sandbox {
 					message: "The code doesn't return an array of arrays",
 					description:
 						'Please return an array of arrays. One array for the different outputs and one for the different items that get returned.',
-					itemIndex: this.itemIndex,
 				});
 			}
 
@@ -101,30 +100,10 @@ export class JavaScriptSandbox extends Sandbox {
 		);
 	}
 
-	async runCodeEachItem(): Promise<INodeExecutionData | undefined> {
+	async runCodeEachItem(itemIndex: number): Promise<INodeExecutionData | undefined> {
 		const script = `module.exports = async function() {${this.jsCode}\n}()`;
 
-		const match = this.jsCode.match(/\$input\.(?<disallowedMethod>first|last|all|itemMatching)/);
-
-		if (match?.groups?.disallowedMethod) {
-			const { disallowedMethod } = match.groups;
-
-			const lineNumber =
-				this.jsCode.split('\n').findIndex((line) => {
-					return line.includes(disallowedMethod) && !line.startsWith('//') && !line.startsWith('*');
-				}) + 1;
-
-			const disallowedMethodFound = lineNumber !== 0;
-
-			if (disallowedMethodFound) {
-				throw new ValidationError({
-					message: `Can't use .${disallowedMethod}() here`,
-					description: "This is only available in 'Run Once for All Items' mode",
-					itemIndex: this.itemIndex,
-					lineNumber,
-				});
-			}
-		}
+		validateNoDisallowedMethodsInRunForEach(this.jsCode, itemIndex);
 
 		let executionResult: INodeExecutionData;
 
@@ -132,16 +111,13 @@ export class JavaScriptSandbox extends Sandbox {
 			executionResult = await this.vm.run(script, __dirname);
 		} catch (error) {
 			// anticipate user expecting `item` to pre-exist as in Function Item node
-			if (error.message === 'item is not defined' && !/(let|const|var) item =/.test(script)) {
-				const quoted = error.message.replace('item', '`item`');
-				error.message = (quoted as string) + '. Did you mean `$input.item.json`?';
-			}
+			mapItemNotDefinedErrorIfNeededForRunForEach(this.jsCode, error);
 
-			throw new ExecutionError(error, this.itemIndex);
+			throw new ExecutionError(error, itemIndex);
 		}
 
-		if (executionResult === null) return;
+		if (executionResult === null) return undefined;
 
-		return this.validateRunCodeEachItem(executionResult);
+		return this.validateRunCodeEachItem(executionResult, itemIndex);
 	}
 }
diff --git a/packages/nodes-base/nodes/Code/JsCodeValidator.ts b/packages/nodes-base/nodes/Code/JsCodeValidator.ts
new file mode 100644
index 0000000000..fecb6a6854
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/JsCodeValidator.ts
@@ -0,0 +1,54 @@
+import { ValidationError } from './ValidationError';
+
+/**
+ * Validates that no disallowed methods are used in the
+ * runCodeForEachItem JS code. Throws `ValidationError` if
+ * a disallowed method is found.
+ */
+export function validateNoDisallowedMethodsInRunForEach(code: string, itemIndex: number) {
+	const match = code.match(/\$input\.(?<disallowedMethod>first|last|all|itemMatching)/);
+
+	if (match?.groups?.disallowedMethod) {
+		const { disallowedMethod } = match.groups;
+
+		const lineNumber =
+			code.split('\n').findIndex((line) => {
+				return line.includes(disallowedMethod) && !line.startsWith('//') && !line.startsWith('*');
+			}) + 1;
+
+		const disallowedMethodFound = lineNumber !== 0;
+
+		if (disallowedMethodFound) {
+			throw new ValidationError({
+				message: `Can't use .${disallowedMethod}() here`,
+				description: "This is only available in 'Run Once for All Items' mode",
+				itemIndex,
+				lineNumber,
+			});
+		}
+	}
+}
+
+/**
+ * Checks if the error message indicates that `items` is not defined and
+ * modifies the error message to suggest using `$input.all()`.
+ */
+export function mapItemsNotDefinedErrorIfNeededForRunForAll(code: string, error: Error) {
+	// anticipate user expecting `items` to pre-exist as in Function Item node
+	if (error.message === 'items is not defined' && !/(let|const|var) +items +=/.test(code)) {
+		const quoted = error.message.replace('items', '`items`');
+		error.message = (quoted as string) + '. Did you mean `$input.all()`?';
+	}
+}
+
+/**
+ * Maps the "item is not defined" error message to provide a more helpful suggestion
+ * for users who may expect `items` to pre-exist
+ */
+export function mapItemNotDefinedErrorIfNeededForRunForEach(code: string, error: Error) {
+	// anticipate user expecting `items` to pre-exist as in Function Item node
+	if (error.message === 'item is not defined' && !/(let|const|var) +item +=/.test(code)) {
+		const quoted = error.message.replace('item', '`item`');
+		error.message = (quoted as string) + '. Did you mean `$input.item.json`?';
+	}
+}
diff --git a/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts b/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts
new file mode 100644
index 0000000000..37d504be5b
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts
@@ -0,0 +1,73 @@
+import {
+	ApplicationError,
+	type CodeExecutionMode,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type WorkflowExecuteMode,
+} from 'n8n-workflow';
+
+import { isWrappableError, WrappedExecutionError } from './errors/WrappedExecutionError';
+import { validateNoDisallowedMethodsInRunForEach } from './JsCodeValidator';
+
+/**
+ * JS Code execution sandbox that executes the JS code using task runner.
+ */
+export class JsTaskRunnerSandbox {
+	constructor(
+		private readonly jsCode: string,
+		private readonly nodeMode: CodeExecutionMode,
+		private readonly workflowMode: WorkflowExecuteMode,
+		private readonly executeFunctions: IExecuteFunctions,
+	) {}
+
+	async runCodeAllItems(): Promise<INodeExecutionData[]> {
+		const itemIndex = 0;
+
+		const executionResult = await this.executeFunctions.startJob<INodeExecutionData[]>(
+			'javascript',
+			{
+				code: this.jsCode,
+				nodeMode: this.nodeMode,
+				workflowMode: this.workflowMode,
+				continueOnFail: this.executeFunctions.continueOnFail(),
+			},
+			itemIndex,
+		);
+
+		return executionResult.ok
+			? executionResult.result
+			: this.throwExecutionError(executionResult.error);
+	}
+
+	async runCodeForEachItem(): Promise<INodeExecutionData[]> {
+		validateNoDisallowedMethodsInRunForEach(this.jsCode, 0);
+		const itemIndex = 0;
+
+		const executionResult = await this.executeFunctions.startJob<INodeExecutionData[]>(
+			'javascript',
+			{
+				code: this.jsCode,
+				nodeMode: this.nodeMode,
+				workflowMode: this.workflowMode,
+				continueOnFail: this.executeFunctions.continueOnFail(),
+			},
+			itemIndex,
+		);
+
+		return executionResult.ok
+			? executionResult.result
+			: this.throwExecutionError(executionResult.error);
+	}
+
+	private throwExecutionError(error: unknown): never {
+		// The error coming from task runner is not an instance of error,
+		// so we need to wrap it in an error instance.
+		if (isWrappableError(error)) {
+			throw new WrappedExecutionError(error);
+		}
+
+		throw new ApplicationError('Unknown error', {
+			cause: error,
+		});
+	}
+}
diff --git a/packages/nodes-base/nodes/Code/PythonSandbox.ts b/packages/nodes-base/nodes/Code/PythonSandbox.ts
index fd1ab3f564..13a3bb6228 100644
--- a/packages/nodes-base/nodes/Code/PythonSandbox.ts
+++ b/packages/nodes-base/nodes/Code/PythonSandbox.ts
@@ -18,7 +18,6 @@ export class PythonSandbox extends Sandbox {
 	constructor(
 		context: SandboxContext,
 		private pythonCode: string,
-		itemIndex: number | undefined,
 		helpers: IExecuteFunctions['helpers'],
 	) {
 		super(
@@ -28,7 +27,6 @@ export class PythonSandbox extends Sandbox {
 					plural: 'dictionaries',
 				},
 			},
-			itemIndex,
 			helpers,
 		);
 		// Since python doesn't allow variable names starting with `$`,
@@ -39,8 +37,8 @@ export class PythonSandbox extends Sandbox {
 		}, {} as PythonSandboxContext);
 	}
 
-	async runCode(): Promise<unknown> {
-		return await this.runCodeInPython<unknown>();
+	async runCode<T = unknown>(): Promise<T> {
+		return await this.runCodeInPython<T>();
 	}
 
 	async runCodeAllItems() {
@@ -48,9 +46,9 @@ export class PythonSandbox extends Sandbox {
 		return this.validateRunCodeAllItems(executionResult);
 	}
 
-	async runCodeEachItem() {
+	async runCodeEachItem(itemIndex: number) {
 		const executionResult = await this.runCodeInPython<INodeExecutionData>();
-		return this.validateRunCodeEachItem(executionResult);
+		return this.validateRunCodeEachItem(executionResult, itemIndex);
 	}
 
 	private async runCodeInPython<T>() {
diff --git a/packages/nodes-base/nodes/Code/Sandbox.ts b/packages/nodes-base/nodes/Code/Sandbox.ts
index aab88f1b39..932a3f0c39 100644
--- a/packages/nodes-base/nodes/Code/Sandbox.ts
+++ b/packages/nodes-base/nodes/Code/Sandbox.ts
@@ -1,7 +1,8 @@
 import { EventEmitter } from 'events';
 import type { IExecuteFunctions, INodeExecutionData, IWorkflowDataProxyData } from 'n8n-workflow';
-import { ValidationError } from './ValidationError';
+
 import { isObject } from './utils';
+import { ValidationError } from './ValidationError';
 
 interface SandboxTextKeys {
 	object: {
@@ -39,26 +40,28 @@ export function getSandboxContext(this: IExecuteFunctions, index: number): Sandb
 export abstract class Sandbox extends EventEmitter {
 	constructor(
 		private textKeys: SandboxTextKeys,
-		protected itemIndex: number | undefined,
 		protected helpers: IExecuteFunctions['helpers'],
 	) {
 		super();
 	}
 
-	abstract runCode(): Promise<unknown>;
+	abstract runCode<T = unknown>(): Promise<T>;
 
 	abstract runCodeAllItems(): Promise<INodeExecutionData[] | INodeExecutionData[][]>;
 
-	abstract runCodeEachItem(): Promise<INodeExecutionData | undefined>;
+	abstract runCodeEachItem(itemIndex: number): Promise<INodeExecutionData | undefined>;
 
-	validateRunCodeEachItem(executionResult: INodeExecutionData | undefined): INodeExecutionData {
+	validateRunCodeEachItem(
+		executionResult: INodeExecutionData | undefined,
+		itemIndex: number,
+	): INodeExecutionData {
 		if (typeof executionResult !== 'object') {
 			throw new ValidationError({
 				message: `Code doesn't return ${this.getTextKey('object', { includeArticle: true })}`,
 				description: `Please return ${this.getTextKey('object', {
 					includeArticle: true,
 				})} representing the output item. ('${executionResult}' was returned instead.)`,
-				itemIndex: this.itemIndex,
+				itemIndex,
 			});
 		}
 
@@ -70,25 +73,24 @@ export abstract class Sandbox extends EventEmitter {
 			throw new ValidationError({
 				message: `Code doesn't return a single ${this.getTextKey('object')}`,
 				description: `${firstSentence} If you need to output multiple items, please use the 'Run Once for All Items' mode instead.`,
-				itemIndex: this.itemIndex,
+				itemIndex,
 			});
 		}
 
 		const [returnData] = this.helpers.normalizeItems([executionResult]);
 
-		this.validateItem(returnData);
+		this.validateItem(returnData, itemIndex);
 
 		// If at least one top-level key is a supported item key (`json`, `binary`, etc.),
 		// and another top-level key is unrecognized, then the user mis-added a property
 		// directly on the item, when they intended to add it on the `json` property
-		this.validateTopLevelKeys(returnData);
+		this.validateTopLevelKeys(returnData, itemIndex);
 
 		return returnData;
 	}
 
 	validateRunCodeAllItems(
 		executionResult: INodeExecutionData | INodeExecutionData[] | undefined,
-		itemIndex?: number,
 	): INodeExecutionData[] {
 		if (typeof executionResult !== 'object') {
 			throw new ValidationError({
@@ -96,7 +98,6 @@ export abstract class Sandbox extends EventEmitter {
 				description: `Please return an array of ${this.getTextKey('object', {
 					plural: true,
 				})}, one for each item you would like to output.`,
-				itemIndex,
 			});
 		}
 
@@ -113,14 +114,15 @@ export abstract class Sandbox extends EventEmitter {
 			);
 
 			if (mustHaveTopLevelN8nKey) {
-				for (const item of executionResult) {
-					this.validateTopLevelKeys(item);
+				for (let index = 0; index < executionResult.length; index++) {
+					const item = executionResult[index];
+					this.validateTopLevelKeys(item, index);
 				}
 			}
 		}
 
 		const returnData = this.helpers.normalizeItems(executionResult);
-		returnData.forEach((item) => this.validateItem(item));
+		returnData.forEach((item, index) => this.validateItem(item, index));
 		return returnData;
 	}
 
@@ -138,7 +140,7 @@ export abstract class Sandbox extends EventEmitter {
 		return `a ${response}`;
 	}
 
-	private validateItem({ json, binary }: INodeExecutionData) {
+	private validateItem({ json, binary }: INodeExecutionData, itemIndex: number) {
 		if (json === undefined || !isObject(json)) {
 			throw new ValidationError({
 				message: `A 'json' property isn't ${this.getTextKey('object', { includeArticle: true })}`,
@@ -146,7 +148,7 @@ export abstract class Sandbox extends EventEmitter {
 					'object',
 					{ includeArticle: true },
 				)}.`,
-				itemIndex: this.itemIndex,
+				itemIndex,
 			});
 		}
 
@@ -157,18 +159,18 @@ export abstract class Sandbox extends EventEmitter {
 					'object',
 					{ includeArticle: true },
 				)}.`,
-				itemIndex: this.itemIndex,
+				itemIndex,
 			});
 		}
 	}
 
-	private validateTopLevelKeys(item: INodeExecutionData) {
+	private validateTopLevelKeys(item: INodeExecutionData, itemIndex: number) {
 		Object.keys(item).forEach((key) => {
 			if (REQUIRED_N8N_ITEM_KEYS.has(key)) return;
 			throw new ValidationError({
 				message: `Unknown top-level item key: ${key}`,
 				description: 'Access the properties of an item under `.json`, e.g. `item.json`',
-				itemIndex: this.itemIndex,
+				itemIndex,
 			});
 		});
 	}
diff --git a/packages/nodes-base/nodes/Code/errors/WrappedExecutionError.ts b/packages/nodes-base/nodes/Code/errors/WrappedExecutionError.ts
new file mode 100644
index 0000000000..8f6fa40719
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/errors/WrappedExecutionError.ts
@@ -0,0 +1,35 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export type WrappableError = Record<string, unknown>;
+
+/**
+ * Errors received from the task runner are not instances of Error.
+ * This class wraps them in an Error instance and makes all their
+ * properties available.
+ */
+export class WrappedExecutionError extends ApplicationError {
+	[key: string]: unknown;
+
+	constructor(error: WrappableError) {
+		const message = typeof error.message === 'string' ? error.message : 'Unknown error';
+		super(message, {
+			cause: error,
+		});
+
+		this.copyErrorProperties(error);
+	}
+
+	private copyErrorProperties(error: WrappableError) {
+		for (const key of Object.getOwnPropertyNames(error)) {
+			if (key === 'message' || key === 'stack') {
+				continue;
+			}
+
+			this[key] = error[key];
+		}
+	}
+}
+
+export function isWrappableError(error: unknown): error is WrappableError {
+	return typeof error === 'object' && error !== null;
+}
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
index 642ce1484f..333a412a02 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
@@ -80,7 +80,7 @@ export async function elasticsearchApiRequest(
 	}
 
 	try {
-		return await this.helpers.requestWithAuthentication.call(this, 'elasticsearchApi', options);
+		return await this.helpers.httpRequestWithAuthentication.call(this, 'elasticsearchApi', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
diff --git a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
index f2670607c3..13caad5b5d 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
@@ -22,6 +22,7 @@ const versionDescription: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	usableAsTool: true,
 	credentials: [
 		{
 			name: 'smtp',
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts
new file mode 100644
index 0000000000..ad35bff192
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts
@@ -0,0 +1,19 @@
+import { mock } from 'jest-mock-extended';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+
+import { ExecuteWorkflowTrigger } from '../ExecuteWorkflowTrigger.node';
+
+describe('ExecuteWorkflowTrigger', () => {
+	it('should return its input data', async () => {
+		const mockInputData: INodeExecutionData[] = [
+			{ json: { item: 0, foo: 'bar' } },
+			{ json: { item: 1, foo: 'quz' } },
+		];
+		const executeFns = mock<IExecuteFunctions>({
+			getInputData: () => mockInputData,
+		});
+		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);
+
+		expect(result).toEqual([mockInputData]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.json b/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.json
index 57bdf62dd7..d4822cb80b 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.json
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.filesreadwrite/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readwritefile/"
 			}
 		]
 	},
diff --git a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
new file mode 100644
index 0000000000..fba596c87e
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
@@ -0,0 +1,316 @@
+import { mock } from 'jest-mock-extended';
+import { NodeOperationError, type INode } from 'n8n-workflow';
+
+import { testVersionedWebhookTriggerNode } from '@test/nodes/TriggerHelpers';
+
+import { FormTrigger } from '../FormTrigger.node';
+import type { FormField } from '../interfaces';
+
+describe('FormTrigger', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should render a form template with correct fields', async () => {
+		const formFields: FormField[] = [
+			{ fieldLabel: 'Name', fieldType: 'text', requiredField: true },
+			{ fieldLabel: 'Age', fieldType: 'number', requiredField: false },
+			{ fieldLabel: 'Notes', fieldType: 'textarea', 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,
+			},
+		];
+
+		const { response, responseData } = await testVersionedWebhookTriggerNode(FormTrigger, 2, {
+			mode: 'manual',
+			node: {
+				parameters: {
+					formTitle: 'Test Form',
+					formDescription: 'Test Description',
+					responseMode: 'onReceived',
+					formFields: { values: formFields },
+					options: {
+						appendAttribution: false,
+						respondWithOptions: { values: { respondWith: 'text' } },
+					},
+				},
+			},
+		});
+
+		expect(response.render).toHaveBeenCalledWith('form-trigger', {
+			appendAttribution: false,
+			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: '',
+					label: 'Notes',
+					placeholder: undefined,
+					isTextarea: true,
+				},
+				{
+					defaultValue: '',
+					errorId: 'error-field-3',
+					id: 'field-3',
+					inputRequired: 'form-required',
+					isInput: true,
+					label: 'Gender',
+					placeholder: undefined,
+					type: 'select',
+				},
+				{
+					acceptFileTypes: '.pdf,.doc',
+					defaultValue: '',
+					errorId: 'error-field-4',
+					id: 'field-4',
+					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,
+		});
+
+		expect(responseData).toEqual({ noWebhookResponse: true });
+	});
+
+	it('should return workflowData on POST request', async () => {
+		const formFields: FormField[] = [
+			{ fieldLabel: 'Name', fieldType: 'text', requiredField: true },
+			{ fieldLabel: 'Age', fieldType: 'number', requiredField: false },
+			{ fieldLabel: 'Date', fieldType: 'date', formatDate: 'dd MMM', requiredField: false },
+			{ fieldLabel: 'Empty', fieldType: 'number', requiredField: false },
+			{
+				fieldLabel: 'Tags',
+				fieldType: 'select',
+				multiselect: true,
+				requiredField: false,
+				fieldOptions: { values: [{ option: 'Popular' }, { option: 'Recent' }] },
+			},
+		];
+
+		const bodyData = {
+			data: {
+				'field-0': 'John Doe',
+				'field-1': '30',
+				'field-2': '2024-08-31',
+				'field-4': '{}',
+			},
+		};
+
+		const { responseData } = await testVersionedWebhookTriggerNode(FormTrigger, 2, {
+			mode: 'manual',
+			node: {
+				parameters: {
+					formTitle: 'Test Form',
+					formDescription: 'Test Description',
+					responseMode: 'onReceived',
+					formFields: { values: formFields },
+				},
+			},
+			request: { method: 'POST' },
+			bodyData,
+		});
+
+		expect(responseData).toEqual({
+			webhookResponse: { status: 200 },
+			workflowData: [
+				[
+					{
+						json: {
+							Name: 'John Doe',
+							Age: 30,
+							Date: '31 Jan',
+							Empty: null,
+							Tags: {},
+							submittedAt: expect.any(String),
+							formMode: 'test',
+						},
+					},
+				],
+			],
+		});
+	});
+
+	describe('Respond to Webhook', () => {
+		it('should throw when misconfigured', async () => {
+			await expect(
+				testVersionedWebhookTriggerNode(FormTrigger, 2, {
+					node: {
+						parameters: {
+							responseMode: 'responseNode',
+						},
+					},
+					request: { method: 'POST' },
+					childNodes: [],
+				}),
+			).rejects.toEqual(
+				new NodeOperationError(mock<INode>(), 'No Respond to Webhook node found in the workflow'),
+			);
+
+			await expect(
+				testVersionedWebhookTriggerNode(FormTrigger, 2, {
+					node: {
+						parameters: {
+							responseMode: 'onReceived',
+						},
+					},
+					request: { method: 'POST' },
+					childNodes: [
+						{
+							name: 'Test Respond To Webhook',
+							type: 'n8n-nodes-base.respondToWebhook',
+							typeVersion: 1,
+						},
+					],
+				}),
+			).rejects.toEqual(
+				new NodeOperationError(mock<INode>(), 'n8n Form Trigger node not correctly configured'),
+			);
+		});
+	});
+
+	it('should throw on invalid webhook authentication', async () => {
+		const formFields: FormField[] = [
+			{ fieldLabel: 'Name', fieldType: 'text', requiredField: true },
+			{ fieldLabel: 'Age', fieldType: 'number', requiredField: false },
+		];
+
+		const { responseData, response } = await testVersionedWebhookTriggerNode(FormTrigger, 2, {
+			mode: 'manual',
+			node: {
+				parameters: {
+					formTitle: 'Test Form',
+					formDescription: 'Test Description',
+					responseMode: 'onReceived',
+					formFields: { values: formFields },
+					authentication: 'basicAuth',
+				},
+			},
+			request: { method: 'POST' },
+		});
+
+		expect(responseData).toEqual({ noWebhookResponse: true });
+		expect(response.status).toHaveBeenCalledWith(401);
+		expect(response.setHeader).toHaveBeenCalledWith(
+			'WWW-Authenticate',
+			'Basic realm="Enter credentials"',
+		);
+	});
+
+	it('should handle files', async () => {
+		const formFields: FormField[] = [
+			{
+				fieldLabel: 'Resume',
+				fieldType: 'file',
+				requiredField: true,
+				acceptFileTypes: '.pdf,.doc',
+				multipleFiles: false,
+			},
+			{
+				fieldLabel: 'Attachments',
+				fieldType: 'file',
+				requiredField: true,
+				acceptFileTypes: '.pdf,.doc',
+				multipleFiles: true,
+			},
+		];
+
+		const bodyData = {
+			files: {
+				'field-0': {
+					originalFilename: 'resume.pdf',
+					mimetype: 'application/json',
+					filepath: '/resume.pdf',
+					size: 200,
+				},
+				'field-1': [
+					{
+						originalFilename: 'attachment1.pdf',
+						mimetype: 'application/json',
+						filepath: '/attachment1.pdf',
+						size: 201,
+					},
+				],
+			},
+		};
+
+		const { responseData } = await testVersionedWebhookTriggerNode(FormTrigger, 2, {
+			mode: 'trigger',
+			node: {
+				parameters: {
+					formTitle: 'Test Form',
+					formDescription: 'Test Description',
+					responseMode: 'onReceived',
+					formFields: { values: formFields },
+				},
+			},
+			request: { method: 'POST' },
+			bodyData,
+		});
+
+		expect(responseData?.webhookResponse).toEqual({ status: 200 });
+		expect(responseData?.workflowData).toEqual([
+			[
+				expect.objectContaining({
+					json: {
+						Resume: {
+							filename: 'resume.pdf',
+							mimetype: 'application/json',
+							size: 200,
+						},
+						Attachments: [
+							{
+								filename: 'attachment1.pdf',
+								mimetype: 'application/json',
+								size: 201,
+							},
+						],
+						formMode: 'production',
+						submittedAt: expect.any(String),
+					},
+				}),
+			],
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Form/test/utils.test.ts b/packages/nodes-base/nodes/Form/test/utils.test.ts
index bb44a354e6..59d9c6c118 100644
--- a/packages/nodes-base/nodes/Form/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Form/test/utils.test.ts
@@ -1,153 +1,5 @@
-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,
-			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',
-						},
-					},
-				],
-			],
-		});
-	});
-});
+import { prepareFormData } from '../utils';
 
 describe('FormTrigger, prepareFormData', () => {
 	it('should return valid form data with given parameters', () => {
@@ -359,9 +211,51 @@ describe('FormTrigger, prepareFormData', () => {
 
 		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' },
+			{ id: 'option0_field-0', label: 'Red' },
+			{ id: 'option1_field-0', label: 'Blue' },
+			{ id: 'option2_field-0', label: 'Green' },
+		]);
+	});
+	it('should correctly handle multiselect fields with unique ids', () => {
+		const formFields: FormField[] = [
+			{
+				fieldLabel: 'Favorite Colors',
+				fieldType: 'text',
+				requiredField: true,
+				multiselect: true,
+				fieldOptions: { values: [{ option: 'Red' }, { option: 'Blue' }, { option: 'Green' }] },
+			},
+			{
+				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_field-0', label: 'Red' },
+			{ id: 'option1_field-0', label: 'Blue' },
+			{ id: 'option2_field-0', label: 'Green' },
+		]);
+		expect(result.formFields[1].multiSelectOptions).toEqual([
+			{ id: 'option0_field-1', label: 'Red' },
+			{ id: 'option1_field-1', label: 'Blue' },
+			{ id: 'option2_field-1', label: 'Green' },
 		]);
 	});
 });
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 65eac4007a..b433f3c22a 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -83,7 +83,7 @@ export function prepareFormData({
 			input.isMultiSelect = true;
 			input.multiSelectOptions =
 				field.fieldOptions?.values.map((e, i) => ({
-					id: `option${i}`,
+					id: `option${i}_${input.id}`,
 					label: e.option,
 				})) ?? [];
 		} else if (fieldType === 'file') {
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index ce61e16b09..88395f2eb8 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -1606,7 +1606,13 @@ export class Gitlab implements INodeType {
 						body.commit_message = this.getNodeParameter('commitMessage', i) as string;
 
 						if (additionalParameters.author) {
-							body.author = additionalParameters.author;
+							const author = additionalParameters.author as IDataObject;
+							if (author.name) {
+								body.author_name = author.name;
+							}
+							if (author.email) {
+								body.author_email = author.email;
+							}
 						}
 						if (
 							additionalParameters.branchStart &&
@@ -1648,7 +1654,13 @@ export class Gitlab implements INodeType {
 							{},
 						) as IDataObject;
 						if (additionalParameters.author) {
-							body.author = additionalParameters.author;
+							const author = additionalParameters.author as IDataObject;
+							if (author.name) {
+								body.author_name = author.name;
+							}
+							if (author.email) {
+								body.author_email = author.email;
+							}
 						}
 						body.branch = this.getNodeParameter('branch', i) as string;
 						body.commit_message = this.getNodeParameter('commitMessage', i) as string;
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
index 725ce66e81..6892c88152 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
@@ -216,7 +216,7 @@ export const eventFields: INodeProperties[] = [
 								description:
 									'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
 								typeOptions: {
-									loadOptionsMethod: 'getConferenceSolutations',
+									loadOptionsMethod: 'getConferenceSolutions',
 									loadOptionsDependsOn: ['calendar'],
 								},
 								default: '',
@@ -839,6 +839,58 @@ export const eventFields: INodeProperties[] = [
 				default: 'no',
 				description: 'Whether the event is all day or not',
 			},
+			{
+				displayName: 'Attendees',
+				name: 'attendeesUi',
+				type: 'fixedCollection',
+				placeholder: 'Add Attendees',
+				default: {
+					values: {
+						mode: 'add',
+						attendees: [],
+					},
+				},
+				options: [
+					{
+						displayName: 'Values',
+						name: 'values',
+						values: [
+							{
+								displayName: 'Mode',
+								name: 'mode',
+								type: 'options',
+								default: 'add',
+								options: [
+									{
+										name: 'Add Attendees Below [Default]',
+										value: 'add',
+									},
+									{
+										name: 'Replace Attendees with Those Below',
+										value: 'replace',
+									},
+								],
+							},
+							{
+								displayName: 'Attendees',
+								name: 'attendees',
+								type: 'string',
+								typeOptions: {
+									multipleValues: true,
+									multipleValueButtonText: 'Add Attendee',
+								},
+								default: '',
+								description: 'The attendees of the event. Multiple ones can be separated by comma.',
+							},
+						],
+					},
+				],
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+				},
+			},
 			{
 				displayName: 'Attendees',
 				name: 'attendees',
@@ -849,6 +901,11 @@ export const eventFields: INodeProperties[] = [
 				},
 				default: '',
 				description: 'The attendees of the event. Multiple ones can be separated by comma.',
+				displayOptions: {
+					show: {
+						'@version': [1, 1.1],
+					},
+				},
 			},
 			{
 				displayName: 'Color Name or ID',
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index dfdc9698b7..93866afaf9 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -34,7 +34,7 @@ export class GoogleCalendar implements INodeType {
 		name: 'googleCalendar',
 		icon: 'file:googleCalendar.svg',
 		group: ['input'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Consume Google Calendar API',
 		defaults: {
@@ -42,6 +42,7 @@ export class GoogleCalendar implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'googleCalendarOAuth2Api',
@@ -88,10 +89,10 @@ export class GoogleCalendar implements INodeType {
 		loadOptions: {
 			// Get all the calendars to display them to user so that they can
 			// select them easily
-			async getConferenceSolutations(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+			async getConferenceSolutions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
-				const calendar = this.getCurrentNodeParameter('calendar') as string;
-				const posibleSolutions: IDataObject = {
+				const calendar = this.getCurrentNodeParameter('calendar', { extractValue: true }) as string;
+				const possibleSolutions: IDataObject = {
 					eventHangout: 'Google Hangout',
 					eventNamedHangout: 'Google Hangout Classic',
 					hangoutsMeet: 'Google Meet',
@@ -105,7 +106,7 @@ export class GoogleCalendar implements INodeType {
 				);
 				for (const solution of allowedConferenceSolutionTypes) {
 					returnData.push({
-						name: posibleSolutions[solution] as string,
+						name: possibleSolutions[solution] as string,
 						value: solution,
 					});
 				}
@@ -501,6 +502,7 @@ export class GoogleCalendar implements INodeType {
 								timeZone: updateTimezone,
 							};
 						}
+						// nodeVersion < 1.2
 						if (updateFields.attendees) {
 							body.attendees = [];
 							(updateFields.attendees as string[]).forEach((attendee) => {
@@ -513,6 +515,37 @@ export class GoogleCalendar implements INodeType {
 								);
 							});
 						}
+						// nodeVersion >= 1.2
+						if (updateFields.attendeesUi) {
+							const { mode, attendees } = (
+								updateFields.attendeesUi as {
+									values: {
+										mode: string;
+										attendees: string[];
+									};
+								}
+							).values;
+							body.attendees = [];
+							if (mode === 'add') {
+								const event = await googleApiRequest.call(
+									this,
+									'GET',
+									`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
+								);
+								((event?.attendees as IDataObject[]) || []).forEach((attendee) => {
+									body.attendees?.push(attendee);
+								});
+							}
+							(attendees as string[]).forEach((attendee) => {
+								body.attendees!.push.apply(
+									body.attendees,
+									attendee
+										.split(',')
+										.map((a) => a.trim())
+										.map((email) => ({ email })),
+								);
+							});
+						}
 						if (updateFields.color) {
 							body.colorId = updateFields.color as string;
 						}
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
new file mode 100644
index 0000000000..39fa8a3b0a
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
@@ -0,0 +1,128 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import type { INode, IExecuteFunctions } from 'n8n-workflow';
+
+import { GoogleCalendar } from '../../GoogleCalendar.node';
+
+import * as genericFunctions from '../../GenericFunctions';
+
+jest.mock('../../GenericFunctions', () => ({
+	getTimezones: jest.fn(),
+	googleApiRequest: jest.fn(),
+	googleApiRequestAllItems: jest.fn(),
+	addTimezoneToDate: jest.fn(),
+	addNextOccurrence: jest.fn(),
+	encodeURIComponentOnce: jest.fn(),
+}));
+
+describe('RespondToWebhook Node', () => {
+	let googleCalendar: GoogleCalendar;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		googleCalendar = new GoogleCalendar();
+		mockExecuteFunctions = mock<IExecuteFunctions>({
+			getInputData: jest.fn(),
+			getNode: jest.fn(),
+			getNodeParameter: jest.fn(),
+			getTimezone: jest.fn(),
+			helpers: {
+				constructExecutionMetaData: jest.fn().mockReturnValue([]),
+			},
+		});
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('Google Calendar > Event > Update', () => {
+		it('should update replace attendees in version 1.1', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('update');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myEvent');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				attendees: ['email1@mail.com'],
+			});
+
+			await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(genericFunctions.googleApiRequest).toHaveBeenCalledWith(
+				'PATCH',
+				'/calendar/v3/calendars/undefined/events/myEvent',
+				{ attendees: [{ email: 'email1@mail.com' }] },
+				{},
+			);
+		});
+
+		it('should update replace attendees', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('update');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.2 }));
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myEvent');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				attendeesUi: {
+					values: {
+						mode: 'replace',
+						attendees: ['email1@mail.com'],
+					},
+				},
+			});
+
+			await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(genericFunctions.googleApiRequest).toHaveBeenCalledWith(
+				'PATCH',
+				'/calendar/v3/calendars/undefined/events/myEvent',
+				{ attendees: [{ email: 'email1@mail.com' }] },
+				{},
+			);
+		});
+
+		it('should update add attendees', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('update');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.2 }));
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myEvent');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				attendeesUi: {
+					values: {
+						mode: 'add',
+						attendees: ['email1@mail.com'],
+					},
+				},
+			});
+			(genericFunctions.googleApiRequest as jest.Mock).mockResolvedValueOnce({
+				attendees: [{ email: 'email2@mail.com' }],
+			});
+
+			await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(genericFunctions.googleApiRequest).toHaveBeenCalledTimes(2);
+
+			expect(genericFunctions.googleApiRequest).toHaveBeenCalledWith(
+				'GET',
+				'/calendar/v3/calendars/undefined/events/myEvent',
+			);
+			expect(genericFunctions.googleApiRequest).toHaveBeenCalledWith(
+				'PATCH',
+				'/calendar/v3/calendars/undefined/events/myEvent',
+				{ attendees: [{ email: 'email2@mail.com' }, { email: 'email1@mail.com' }] },
+				{},
+			);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
index 29089a9166..2c5fb28682 100644
--- a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
@@ -36,6 +36,7 @@ export class GoogleDocs implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'googleApi',
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/versionDescription.ts
index 07d229714a..003c3a087b 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/versionDescription.ts
@@ -19,6 +19,7 @@ export const versionDescription: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	usableAsTool: true,
 	credentials: [
 		{
 			name: 'googleApi',
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index 78fc41769d..e856174b38 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -18,20 +18,6 @@ import { DateTime } from 'luxon';
 
 import isEmpty from 'lodash/isEmpty';
 
-export interface IEmail {
-	from?: string;
-	to?: string;
-	cc?: string;
-	bcc?: string;
-	replyTo?: string;
-	inReplyTo?: string;
-	reference?: string;
-	subject: string;
-	body: string;
-	htmlBody?: string;
-	attachments?: IDataObject[];
-}
-
 export interface IAttachments {
 	type: string;
 	name: string;
@@ -40,6 +26,8 @@ export interface IAttachments {
 
 import MailComposer from 'nodemailer/lib/mail-composer';
 import { getGoogleAccessToken } from '../GenericFunctions';
+import { escapeHtml } from '../../../utils/utilities';
+import type { IEmail } from '../../../utils/sendAndWait/interfaces';
 
 export async function googleApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
@@ -516,22 +504,7 @@ export function unescapeSnippets(items: INodeExecutionData[]) {
 	const result = items.map((item) => {
 		const snippet = item.json.snippet as string;
 		if (snippet) {
-			item.json.snippet = snippet.replace(/&amp;|&lt;|&gt;|&#39;|&quot;/g, (match) => {
-				switch (match) {
-					case '&amp;':
-						return '&';
-					case '&lt;':
-						return '<';
-					case '&gt;':
-						return '>';
-					case '&#39;':
-						return "'";
-					case '&quot;':
-						return '"';
-					default:
-						return match;
-				}
-			});
+			item.json.snippet = escapeHtml(snippet);
 		}
 		return item;
 	});
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
new file mode 100644
index 0000000000..4cd2ae0742
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
@@ -0,0 +1,221 @@
+import nock from 'nock';
+import * as mailparser from 'mailparser';
+
+import { testPollingTriggerNode } from '@test/nodes/TriggerHelpers';
+
+import { GmailTrigger } from '../GmailTrigger.node';
+import type { Message, ListMessage, MessageListResponse } from '../types';
+
+jest.mock('mailparser');
+
+describe('GmailTrigger', () => {
+	const baseUrl = 'https://www.googleapis.com';
+
+	function createMessage(message: Partial<Message> = {}): Message {
+		const content = Buffer.from('test');
+		const contentBase64 = content.toString('base64');
+		const size = content.byteLength;
+
+		return {
+			historyId: 'testHistoryId',
+			id: 'testId',
+			internalDate: '1727777957863',
+			raw: contentBase64,
+			labelIds: ['testLabelId'],
+			sizeEstimate: size,
+			snippet: content.toString('utf-8'),
+			threadId: 'testThreadId',
+			payload: {
+				body: { attachmentId: 'testAttachmentId', data: contentBase64, size },
+				filename: 'foo.txt',
+				headers: [{ name: 'testHeader', value: 'testHeaderValue' }],
+				mimeType: 'text/plain',
+				partId: 'testPartId',
+				parts: [],
+			},
+			...message,
+		};
+	}
+
+	function createListMessage(message: Partial<ListMessage> = {}): ListMessage {
+		return { id: 'testId', threadId: 'testThreadId', ...message };
+	}
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+
+		jest.spyOn(mailparser, 'simpleParser').mockResolvedValue({
+			headers: new Map([['headerKey', 'headerValue']]),
+			attachments: [],
+			headerLines: [{ key: 'headerKey', line: 'headerValue' }],
+			html: '<p>test</p>',
+			date: new Date('2024-08-31'),
+			from: {
+				text: 'from@example.com',
+				value: [{ name: 'From', address: 'from@example.com' }],
+				html: 'from@example.com',
+			},
+			to: {
+				text: 'to@example.com',
+				value: [{ name: 'To', address: 'to@example.com' }],
+				html: 'to@example.com',
+			},
+		});
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	it('should return incoming emails', async () => {
+		const messageListResponse: MessageListResponse = {
+			messages: [createListMessage({ id: '1' }), createListMessage({ id: '2' })],
+			resultSizeEstimate: 123,
+		};
+		nock(baseUrl)
+			.get('/gmail/v1/users/me/labels')
+			.reply(200, { labels: [{ id: 'testLabelId', name: 'Test Label Name' }] });
+		nock(baseUrl).get(new RegExp('/gmail/v1/users/me/messages?.*')).reply(200, messageListResponse);
+		nock(baseUrl)
+			.get(new RegExp('/gmail/v1/users/me/messages/1?.*'))
+			.reply(200, createMessage({ id: '1' }));
+		nock(baseUrl)
+			.get(new RegExp('/gmail/v1/users/me/messages/2?.*'))
+			.reply(200, createMessage({ id: '2' }));
+
+		const { response } = await testPollingTriggerNode(GmailTrigger);
+
+		expect(response).toEqual([
+			[
+				{
+					json: {
+						date: '2024-08-31T00:00:00.000Z',
+						from: {
+							html: 'from@example.com',
+							text: 'from@example.com',
+							value: [{ address: 'from@example.com', name: 'From' }],
+						},
+						headers: { headerKey: 'headerValue' },
+						html: '<p>test</p>',
+						id: '1',
+						labelIds: ['testLabelId'],
+						sizeEstimate: 4,
+						threadId: 'testThreadId',
+						to: {
+							html: 'to@example.com',
+							text: 'to@example.com',
+							value: [{ address: 'to@example.com', name: 'To' }],
+						},
+					},
+				},
+				{
+					json: {
+						date: '2024-08-31T00:00:00.000Z',
+						from: {
+							html: 'from@example.com',
+							text: 'from@example.com',
+							value: [{ address: 'from@example.com', name: 'From' }],
+						},
+						headers: { headerKey: 'headerValue' },
+						html: '<p>test</p>',
+						id: '2',
+						labelIds: ['testLabelId'],
+						sizeEstimate: 4,
+						threadId: 'testThreadId',
+						to: {
+							html: 'to@example.com',
+							text: 'to@example.com',
+							value: [{ address: 'to@example.com', name: 'To' }],
+						},
+					},
+				},
+			],
+		]);
+	});
+
+	it('should simplify output when enabled', async () => {
+		const messageListResponse: MessageListResponse = {
+			messages: [createListMessage({ id: '1' }), createListMessage({ id: '2' })],
+			resultSizeEstimate: 123,
+		};
+		nock(baseUrl)
+			.get('/gmail/v1/users/me/labels')
+			.reply(200, { labels: [{ id: 'testLabelId', name: 'Test Label Name' }] });
+		nock(baseUrl).get(new RegExp('/gmail/v1/users/me/messages?.*')).reply(200, messageListResponse);
+		nock(baseUrl)
+			.get(new RegExp('/gmail/v1/users/me/messages/1?.*'))
+			.reply(200, createMessage({ id: '1' }));
+		nock(baseUrl)
+			.get(new RegExp('/gmail/v1/users/me/messages/2?.*'))
+			.reply(200, createMessage({ id: '2' }));
+
+		const { response } = await testPollingTriggerNode(GmailTrigger, {
+			node: { parameters: { simple: true } },
+		});
+
+		expect(response).toEqual([
+			[
+				{
+					json: {
+						historyId: 'testHistoryId',
+						id: '1',
+						internalDate: '1727777957863',
+						labels: [{ id: 'testLabelId', name: 'Test Label Name' }],
+						payload: {
+							body: { attachmentId: 'testAttachmentId', data: 'dGVzdA==', size: 4 },
+							filename: 'foo.txt',
+							mimeType: 'text/plain',
+							partId: 'testPartId',
+							parts: [],
+						},
+						raw: 'dGVzdA==',
+						sizeEstimate: 4,
+						snippet: 'test',
+						testHeader: 'testHeaderValue',
+						threadId: 'testThreadId',
+					},
+				},
+				{
+					json: {
+						historyId: 'testHistoryId',
+						id: '2',
+						internalDate: '1727777957863',
+						labels: [{ id: 'testLabelId', name: 'Test Label Name' }],
+						payload: {
+							body: { attachmentId: 'testAttachmentId', data: 'dGVzdA==', size: 4 },
+							filename: 'foo.txt',
+							mimeType: 'text/plain',
+							partId: 'testPartId',
+							parts: [],
+						},
+						raw: 'dGVzdA==',
+						sizeEstimate: 4,
+						snippet: 'test',
+						testHeader: 'testHeaderValue',
+						threadId: 'testThreadId',
+					},
+				},
+			],
+		]);
+	});
+
+	it('should filter out emails that were already processed', async () => {
+		const messageListResponse: MessageListResponse = {
+			messages: [],
+			resultSizeEstimate: 0,
+		};
+		nock(baseUrl)
+			.get('/gmail/v1/users/me/labels')
+			.reply(200, { labels: [{ id: 'testLabelId', name: 'Test Label Name' }] });
+		nock(baseUrl).get(new RegExp('/gmail/v1/users/me/messages?.*')).reply(200, messageListResponse);
+
+		const { response } = await testPollingTriggerNode(GmailTrigger, {
+			node: { parameters: { simple: true } },
+			workflowStaticData: {
+				'Gmail Trigger': { lastTimeChecked: new Date('2024-10-31').getTime() / 1000 },
+			},
+		});
+
+		expect(response).toEqual(null);
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Gmail/types.ts b/packages/nodes-base/nodes/Google/Gmail/types.ts
new file mode 100644
index 0000000000..5e519a242f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/types.ts
@@ -0,0 +1,39 @@
+export type Message = {
+	id: string;
+	threadId: string;
+	labelIds: string[];
+	snippet: string;
+	historyId: string;
+	internalDate: string;
+	sizeEstimate: number;
+	raw: string;
+	payload: MessagePart;
+};
+
+export type ListMessage = Pick<Message, 'id' | 'threadId'>;
+
+export type MessageListResponse = {
+	messages: ListMessage[];
+	nextPageToken?: string;
+	resultSizeEstimate: number;
+};
+
+type GmailHeader = {
+	name: string;
+	value: string;
+};
+
+type MessagePart = {
+	partId: string;
+	mimeType: string;
+	filename: string;
+	headers: GmailHeader[];
+	body: MessagePartBody;
+	parts: MessagePart[];
+};
+
+type MessagePartBody = {
+	attachmentId: string;
+	size: number;
+	data: string;
+};
diff --git a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
index ff715d2c6d..c17c26eda9 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
@@ -13,7 +13,7 @@ import {
 } from 'n8n-workflow';
 
 import isEmpty from 'lodash/isEmpty';
-import type { IEmail } from '../GenericFunctions';
+import type { IEmail } from '../../../../utils/sendAndWait/interfaces';
 import {
 	encodeEmail,
 	extractEmail,
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
index aa1e1622da..c5e37263b1 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
@@ -8,9 +8,14 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import {
+	NodeConnectionType,
+	NodeOperationError,
+	SEND_AND_WAIT_OPERATION,
+	WAIT_TIME_UNLIMITED,
+} from 'n8n-workflow';
 
-import type { IEmail } from '../GenericFunctions';
+import type { IEmail } from '../../../../utils/sendAndWait/interfaces';
 import {
 	encodeEmail,
 	googleApiRequest,
@@ -33,6 +38,12 @@ import { draftFields, draftOperations } from './DraftDescription';
 
 import { threadFields, threadOperations } from './ThreadDescription';
 
+import {
+	getSendAndWaitProperties,
+	createEmail,
+	sendAndWaitWebhook,
+} from '../../../../utils/sendAndWait/utils';
+
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Gmail',
 	name: 'gmail',
@@ -46,6 +57,7 @@ const versionDescription: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	usableAsTool: true,
 	credentials: [
 		{
 			name: 'googleApi',
@@ -66,6 +78,17 @@ const versionDescription: INodeTypeDescription = {
 			},
 		},
 	],
+	webhooks: [
+		{
+			name: 'default',
+			httpMethod: 'GET',
+			responseMode: 'onReceived',
+			responseData: '',
+			path: '={{ $nodeId }}',
+			restartWebhook: true,
+			isFullPath: true,
+		},
+	],
 	properties: [
 		{
 			displayName: 'Authentication',
@@ -124,6 +147,16 @@ const versionDescription: INodeTypeDescription = {
 		//-------------------------------
 		...messageOperations,
 		...messageFields,
+		...getSendAndWaitProperties([
+			{
+				displayName: 'To',
+				name: 'sendTo',
+				type: 'string',
+				default: '',
+				required: true,
+				placeholder: 'e.g. info@example.com',
+			},
+		]),
 		//-------------------------------
 		// Thread Operations
 		//-------------------------------
@@ -220,6 +253,8 @@ export class GmailV2 implements INodeType {
 		},
 	};
 
+	webhook = sendAndWaitWebhook;
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: INodeExecutionData[] = [];
@@ -228,6 +263,17 @@ export class GmailV2 implements INodeType {
 		const nodeVersion = this.getNode().typeVersion;
 		const instanceId = this.getInstanceId();
 
+		if (resource === 'message' && operation === SEND_AND_WAIT_OPERATION) {
+			const email: IEmail = createEmail(this);
+
+			await googleApiRequest.call(this, 'POST', '/gmail/v1/users/me/messages/send', {
+				raw: await encodeEmail(email),
+			});
+
+			await this.putExecutionToWait(new Date(WAIT_TIME_UNLIMITED));
+			return [this.getInputData()];
+		}
+
 		let responseData;
 
 		for (let i = 0; i < items.length; i++) {
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
index ff3f40eb9a..83b1e6fcb0 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
@@ -1,4 +1,4 @@
-import type { INodeProperties } from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
 import { appendAttributionOption } from '../../../../utils/descriptions';
 
 export const messageOperations: INodeProperties[] = [
@@ -58,6 +58,11 @@ export const messageOperations: INodeProperties[] = [
 				value: 'send',
 				action: 'Send a message',
 			},
+			{
+				name: 'Send and Wait for Approval',
+				value: SEND_AND_WAIT_OPERATION,
+				action: 'Send a message and wait for approval',
+			},
 		],
 		default: 'send',
 	},
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
index 5ac6b0a195..37c1b6c2ba 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/versionDescription.ts
@@ -17,6 +17,7 @@ export const versionDescription: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	usableAsTool: true,
 	hints: [
 		{
 			message:
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
index 55ed1f47fa..d91fa35d44 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
@@ -24,6 +24,7 @@ export class HackerNews implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		properties: [
 			// ----------------------------------
 			//         Resources
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/Description.ts b/packages/nodes-base/nodes/HttpRequest/V3/Description.ts
new file mode 100644
index 0000000000..827c8f32ea
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/V3/Description.ts
@@ -0,0 +1,1177 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const mainProperties: INodeProperties[] = [
+	{
+		displayName: '',
+		name: 'curlImport',
+		type: 'curlImport',
+		default: '',
+	},
+	{
+		displayName: 'Method',
+		name: 'method',
+		type: 'options',
+		options: [
+			{
+				name: 'DELETE',
+				value: 'DELETE',
+			},
+			{
+				name: 'GET',
+				value: 'GET',
+			},
+			{
+				name: 'HEAD',
+				value: 'HEAD',
+			},
+			{
+				name: 'OPTIONS',
+				value: 'OPTIONS',
+			},
+			{
+				name: 'PATCH',
+				value: 'PATCH',
+			},
+			{
+				name: 'POST',
+				value: 'POST',
+			},
+			{
+				name: 'PUT',
+				value: 'PUT',
+			},
+		],
+		default: 'GET',
+		description: 'The request method to use',
+	},
+	{
+		displayName: 'URL',
+		name: 'url',
+		type: 'string',
+		default: '',
+		placeholder: 'http://example.com/index.html',
+		description: 'The URL to make the request to',
+		required: true,
+	},
+	{
+		displayName: 'Authentication',
+		name: 'authentication',
+		noDataExpression: true,
+		type: 'options',
+		options: [
+			{
+				name: 'None',
+				value: 'none',
+			},
+			{
+				name: 'Predefined Credential Type',
+				value: 'predefinedCredentialType',
+				description:
+					"We've already implemented auth for many services so that you don't have to set it up manually",
+			},
+			{
+				name: 'Generic Credential Type',
+				value: 'genericCredentialType',
+				description: 'Fully customizable. Choose between basic, header, OAuth2, etc.',
+			},
+		],
+		default: 'none',
+	},
+	{
+		displayName: 'Credential Type',
+		name: 'nodeCredentialType',
+		type: 'credentialsSelect',
+		noDataExpression: true,
+		required: true,
+		default: '',
+		credentialTypes: ['extends:oAuth2Api', 'extends:oAuth1Api', 'has:authenticate'],
+		displayOptions: {
+			show: {
+				authentication: ['predefinedCredentialType'],
+			},
+		},
+	},
+	{
+		displayName:
+			'Make sure you have specified the scope(s) for the Service Account in the credential',
+		name: 'googleApiWarning',
+		type: 'notice',
+		default: '',
+		displayOptions: {
+			show: {
+				nodeCredentialType: ['googleApi'],
+			},
+		},
+	},
+	{
+		displayName: 'Generic Auth Type',
+		name: 'genericAuthType',
+		type: 'credentialsSelect',
+		required: true,
+		default: '',
+		credentialTypes: ['has:genericAuth'],
+		displayOptions: {
+			show: {
+				authentication: ['genericCredentialType'],
+			},
+		},
+	},
+	{
+		displayName: 'SSL Certificates',
+		name: 'provideSslCertificates',
+		type: 'boolean',
+		default: false,
+		isNodeSetting: true,
+	},
+	{
+		displayName: "Provide certificates in node's 'Credential for SSL Certificates' parameter",
+		name: 'provideSslCertificatesNotice',
+		type: 'notice',
+		default: '',
+		isNodeSetting: true,
+		displayOptions: {
+			show: {
+				provideSslCertificates: [true],
+			},
+		},
+	},
+	{
+		displayName: 'SSL Certificate',
+		name: 'sslCertificate',
+		type: 'credentials',
+		default: '',
+		displayOptions: {
+			show: {
+				provideSslCertificates: [true],
+			},
+		},
+	},
+	{
+		displayName: 'Send Query Parameters',
+		name: 'sendQuery',
+		type: 'boolean',
+		default: false,
+		noDataExpression: true,
+		description: 'Whether the request has query params or not',
+	},
+	{
+		displayName: 'Specify Query Parameters',
+		name: 'specifyQuery',
+		type: 'options',
+		displayOptions: {
+			show: {
+				sendQuery: [true],
+			},
+		},
+		options: [
+			{
+				name: 'Using Fields Below',
+				value: 'keypair',
+			},
+			{
+				name: 'Using JSON',
+				value: 'json',
+			},
+		],
+		default: 'keypair',
+	},
+	{
+		displayName: 'Query Parameters',
+		name: 'queryParameters',
+		type: 'fixedCollection',
+		displayOptions: {
+			show: {
+				sendQuery: [true],
+				specifyQuery: ['keypair'],
+			},
+		},
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Parameter',
+		default: {
+			parameters: [
+				{
+					name: '',
+					value: '',
+				},
+			],
+		},
+		options: [
+			{
+				name: 'parameters',
+				displayName: 'Parameter',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'JSON',
+		name: 'jsonQuery',
+		type: 'json',
+		displayOptions: {
+			show: {
+				sendQuery: [true],
+				specifyQuery: ['json'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Send Headers',
+		name: 'sendHeaders',
+		type: 'boolean',
+		default: false,
+		noDataExpression: true,
+		description: 'Whether the request has headers or not',
+	},
+	{
+		displayName: 'Specify Headers',
+		name: 'specifyHeaders',
+		type: 'options',
+		displayOptions: {
+			show: {
+				sendHeaders: [true],
+			},
+		},
+		options: [
+			{
+				name: 'Using Fields Below',
+				value: 'keypair',
+			},
+			{
+				name: 'Using JSON',
+				value: 'json',
+			},
+		],
+		default: 'keypair',
+	},
+	{
+		displayName: 'Header Parameters',
+		name: 'headerParameters',
+		type: 'fixedCollection',
+		displayOptions: {
+			show: {
+				sendHeaders: [true],
+				specifyHeaders: ['keypair'],
+			},
+		},
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Parameter',
+		default: {
+			parameters: [
+				{
+					name: '',
+					value: '',
+				},
+			],
+		},
+		options: [
+			{
+				name: 'parameters',
+				displayName: 'Parameter',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'JSON',
+		name: 'jsonHeaders',
+		type: 'json',
+		displayOptions: {
+			show: {
+				sendHeaders: [true],
+				specifyHeaders: ['json'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Send Body',
+		name: 'sendBody',
+		type: 'boolean',
+		default: false,
+		noDataExpression: true,
+		description: 'Whether the request has a body or not',
+	},
+	{
+		displayName: 'Body Content Type',
+		name: 'contentType',
+		type: 'options',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+			},
+		},
+		options: [
+			{
+				name: 'Form Urlencoded',
+				value: 'form-urlencoded',
+			},
+			{
+				name: 'Form-Data',
+				value: 'multipart-form-data',
+			},
+			{
+				name: 'JSON',
+				value: 'json',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				name: 'n8n Binary File',
+				value: 'binaryData',
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+		],
+		default: 'json',
+		description: 'Content-Type to use to send body parameters',
+	},
+	{
+		displayName: 'Specify Body',
+		name: 'specifyBody',
+		type: 'options',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['json'],
+			},
+		},
+		options: [
+			{
+				name: 'Using Fields Below',
+				value: 'keypair',
+			},
+			{
+				name: 'Using JSON',
+				value: 'json',
+			},
+		],
+		default: 'keypair',
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-json
+		description:
+			'The body can be specified using explicit fields (<code>keypair</code>) or using a JavaScript object (<code>json</code>)',
+	},
+	{
+		displayName: 'Body Parameters',
+		name: 'bodyParameters',
+		type: 'fixedCollection',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['json'],
+				specifyBody: ['keypair'],
+			},
+		},
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Parameter',
+		default: {
+			parameters: [
+				{
+					name: '',
+					value: '',
+				},
+			],
+		},
+		options: [
+			{
+				name: 'parameters',
+				displayName: 'Parameter',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description:
+							'ID of the field to set. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the field to set',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'JSON',
+		name: 'jsonBody',
+		type: 'json',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['json'],
+				specifyBody: ['json'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Body Parameters',
+		name: 'bodyParameters',
+		type: 'fixedCollection',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['multipart-form-data'],
+			},
+		},
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Parameter',
+		default: {
+			parameters: [
+				{
+					name: '',
+					value: '',
+				},
+			],
+		},
+		options: [
+			{
+				name: 'parameters',
+				displayName: 'Parameter',
+				values: [
+					{
+						displayName: 'Parameter Type',
+						name: 'parameterType',
+						type: 'options',
+						options: [
+							{
+								// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+								name: 'n8n Binary File',
+								value: 'formBinaryData',
+							},
+							{
+								name: 'Form Data',
+								value: 'formData',
+							},
+						],
+						default: 'formData',
+					},
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description:
+							'ID of the field to set. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						displayOptions: {
+							show: {
+								parameterType: ['formData'],
+							},
+						},
+						default: '',
+						description: 'Value of the field to set',
+					},
+					{
+						displayName: 'Input Data Field Name',
+						name: 'inputDataFieldName',
+						type: 'string',
+						displayOptions: {
+							show: {
+								parameterType: ['formBinaryData'],
+							},
+						},
+						default: '',
+						description:
+							'The name of the incoming field containing the binary file data to be processed',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Specify Body',
+		name: 'specifyBody',
+		type: 'options',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['form-urlencoded'],
+			},
+		},
+		options: [
+			{
+				name: 'Using Fields Below',
+				value: 'keypair',
+			},
+			{
+				name: 'Using Single Field',
+				value: 'string',
+			},
+		],
+		default: 'keypair',
+	},
+	{
+		displayName: 'Body Parameters',
+		name: 'bodyParameters',
+		type: 'fixedCollection',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['form-urlencoded'],
+				specifyBody: ['keypair'],
+			},
+		},
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Parameter',
+		default: {
+			parameters: [
+				{
+					name: '',
+					value: '',
+				},
+			],
+		},
+		options: [
+			{
+				name: 'parameters',
+				displayName: 'Parameter',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description:
+							'ID of the field to set. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the field to set',
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Body',
+		name: 'body',
+		type: 'string',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				specifyBody: ['string'],
+			},
+		},
+		default: '',
+		placeholder: 'field1=value1&field2=value2',
+	},
+	{
+		displayName: 'Input Data Field Name',
+		name: 'inputDataFieldName',
+		type: 'string',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['binaryData'],
+			},
+		},
+		default: '',
+		description: 'The name of the incoming field containing the binary file data to be processed',
+	},
+	{
+		displayName: 'Content Type',
+		name: 'rawContentType',
+		type: 'string',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['raw'],
+			},
+		},
+		default: '',
+		placeholder: 'text/html',
+	},
+	{
+		displayName: 'Body',
+		name: 'body',
+		type: 'string',
+		displayOptions: {
+			show: {
+				sendBody: [true],
+				contentType: ['raw'],
+			},
+		},
+		default: '',
+		placeholder: '',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add option',
+		default: {},
+		options: [
+			{
+				displayName: 'Batching',
+				name: 'batching',
+				placeholder: 'Add Batching',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {
+					batch: {},
+				},
+				options: [
+					{
+						displayName: 'Batching',
+						name: 'batch',
+						values: [
+							{
+								displayName: 'Items per Batch',
+								name: 'batchSize',
+								type: 'number',
+								typeOptions: {
+									minValue: -1,
+								},
+								default: 50,
+								description:
+									'Input will be split in batches to throttle requests. -1 for disabled. 0 will be treated as 1.',
+							},
+							{
+								// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+								displayName: 'Batch Interval (ms)',
+								name: 'batchInterval',
+								type: 'number',
+								typeOptions: {
+									minValue: 0,
+								},
+								default: 1000,
+								description:
+									'Time (in milliseconds) between each batch of requests. 0 for disabled.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Ignore SSL Issues',
+				name: 'allowUnauthorizedCerts',
+				type: 'boolean',
+				noDataExpression: true,
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-ignore-ssl-issues
+				description:
+					'Whether to download the response even if SSL certificate validation is not possible',
+			},
+			{
+				displayName: 'Array Format in Query Parameters',
+				name: 'queryParameterArrays',
+				type: 'options',
+				displayOptions: {
+					show: {
+						'/sendQuery': [true],
+					},
+				},
+				options: [
+					{
+						name: 'No Brackets',
+						value: 'repeat',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-lowercase-first-char
+						description: 'e.g. foo=bar&foo=qux',
+					},
+					{
+						name: 'Brackets Only',
+						value: 'brackets',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-lowercase-first-char
+						description: 'e.g. foo[]=bar&foo[]=qux',
+					},
+					{
+						name: 'Brackets with Indices',
+						value: 'indices',
+						// eslint-disable-next-line n8n-nodes-base/node-param-description-lowercase-first-char
+						description: 'e.g. foo[0]=bar&foo[1]=qux',
+					},
+				],
+				default: 'brackets',
+			},
+			{
+				displayName: 'Lowercase Headers',
+				name: 'lowercaseHeaders',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to lowercase header names',
+			},
+			{
+				displayName: 'Redirects',
+				name: 'redirect',
+				placeholder: 'Add Redirect',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: { redirect: {} },
+				options: [
+					{
+						displayName: 'Redirect',
+						name: 'redirect',
+						values: [
+							{
+								displayName: 'Follow Redirects',
+								name: 'followRedirects',
+								type: 'boolean',
+								default: false,
+								noDataExpression: true,
+								description: 'Whether to follow all redirects',
+							},
+							{
+								displayName: 'Max Redirects',
+								name: 'maxRedirects',
+								type: 'number',
+								displayOptions: {
+									show: {
+										followRedirects: [true],
+									},
+								},
+								default: 21,
+								description: 'Max number of redirects to follow',
+							},
+						],
+					},
+				],
+				displayOptions: {
+					show: {
+						'@version': [1, 2, 3],
+					},
+				},
+			},
+			{
+				displayName: 'Redirects',
+				name: 'redirect',
+				placeholder: 'Add Redirect',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {
+					redirect: {},
+				},
+				options: [
+					{
+						displayName: 'Redirect',
+						name: 'redirect',
+						values: [
+							{
+								displayName: 'Follow Redirects',
+								name: 'followRedirects',
+								type: 'boolean',
+								default: true,
+								noDataExpression: true,
+								description: 'Whether to follow all redirects',
+							},
+							{
+								displayName: 'Max Redirects',
+								name: 'maxRedirects',
+								type: 'number',
+								displayOptions: {
+									show: {
+										followRedirects: [true],
+									},
+								},
+								default: 21,
+								description: 'Max number of redirects to follow',
+							},
+						],
+					},
+				],
+				displayOptions: {
+					hide: {
+						'@version': [1, 2, 3],
+					},
+				},
+			},
+			{
+				displayName: 'Response',
+				name: 'response',
+				placeholder: 'Add response',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {
+					response: {},
+				},
+				options: [
+					{
+						displayName: 'Response',
+						name: 'response',
+						values: [
+							{
+								displayName: 'Include Response Headers and Status',
+								name: 'fullResponse',
+								type: 'boolean',
+								default: false,
+								description:
+									'Whether to return the full response (headers and response status code) data instead of only the body',
+							},
+							{
+								displayName: 'Never Error',
+								name: 'neverError',
+								type: 'boolean',
+								default: false,
+								description: 'Whether to succeeds also when status code is not 2xx',
+							},
+							{
+								displayName: 'Response Format',
+								name: 'responseFormat',
+								type: 'options',
+								noDataExpression: true,
+								options: [
+									{
+										name: 'Autodetect',
+										value: 'autodetect',
+									},
+									{
+										name: 'File',
+										value: 'file',
+									},
+									{
+										name: 'JSON',
+										value: 'json',
+									},
+									{
+										name: 'Text',
+										value: 'text',
+									},
+								],
+								default: 'autodetect',
+								description: 'The format in which the data gets returned from the URL',
+							},
+							{
+								displayName: 'Put Output in Field',
+								name: 'outputPropertyName',
+								type: 'string',
+								default: 'data',
+								required: true,
+								displayOptions: {
+									show: {
+										responseFormat: ['file', 'text'],
+									},
+								},
+								description:
+									'Name of the binary property to which to write the data of the read file',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Pagination',
+				name: 'pagination',
+				placeholder: 'Add pagination',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				default: {
+					pagination: {},
+				},
+				options: [
+					{
+						displayName: 'Pagination',
+						name: 'pagination',
+						values: [
+							{
+								displayName: 'Pagination Mode',
+								name: 'paginationMode',
+								type: 'options',
+								typeOptions: {
+									noDataExpression: true,
+								},
+								options: [
+									{
+										name: 'Off',
+										value: 'off',
+									},
+									{
+										name: 'Update a Parameter in Each Request',
+										value: 'updateAParameterInEachRequest',
+									},
+									{
+										name: 'Response Contains Next URL',
+										value: 'responseContainsNextURL',
+									},
+								],
+								default: 'updateAParameterInEachRequest',
+								description: 'If pagination should be used',
+							},
+							{
+								displayName:
+									'Use the $response variables to access the data of the previous response. Refer to the <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/#pagination/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.httpRequest" target="_blank">docs</a> for more info about pagination/',
+								name: 'webhookNotice',
+								displayOptions: {
+									hide: {
+										paginationMode: ['off'],
+									},
+								},
+								type: 'notice',
+								default: '',
+							},
+							{
+								displayName: 'Next URL',
+								name: 'nextURL',
+								type: 'string',
+								displayOptions: {
+									show: {
+										paginationMode: ['responseContainsNextURL'],
+									},
+								},
+								default: '',
+								description:
+									'Should evaluate to the URL of the next page. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/#pagination" target="_blank">More info</a>.',
+							},
+							{
+								displayName: 'Parameters',
+								name: 'parameters',
+								type: 'fixedCollection',
+								displayOptions: {
+									show: {
+										paginationMode: ['updateAParameterInEachRequest'],
+									},
+								},
+								typeOptions: {
+									multipleValues: true,
+									noExpression: true,
+								},
+								placeholder: 'Add Parameter',
+								default: {
+									parameters: [
+										{
+											type: 'qs',
+											name: '',
+											value: '',
+										},
+									],
+								},
+								options: [
+									{
+										name: 'parameters',
+										displayName: 'Parameter',
+										values: [
+											{
+												displayName: 'Type',
+												name: 'type',
+												type: 'options',
+												options: [
+													{
+														name: 'Body',
+														value: 'body',
+													},
+													{
+														name: 'Header',
+														value: 'headers',
+													},
+													{
+														name: 'Query',
+														value: 'qs',
+													},
+												],
+												default: 'qs',
+												description: 'Where the parameter should be set',
+											},
+											{
+												displayName: 'Name',
+												name: 'name',
+												type: 'string',
+												default: '',
+												placeholder: 'e.g page',
+											},
+											{
+												displayName: 'Value',
+												name: 'value',
+												type: 'string',
+												default: '',
+												hint: 'Use expression mode and $response to access response data',
+											},
+										],
+									},
+								],
+							},
+							{
+								displayName: 'Pagination Complete When',
+								name: 'paginationCompleteWhen',
+								type: 'options',
+								typeOptions: {
+									noDataExpression: true,
+								},
+								displayOptions: {
+									hide: {
+										paginationMode: ['off'],
+									},
+								},
+								options: [
+									{
+										name: 'Response Is Empty',
+										value: 'responseIsEmpty',
+									},
+									{
+										name: 'Receive Specific Status Code(s)',
+										value: 'receiveSpecificStatusCodes',
+									},
+									{
+										name: 'Other',
+										value: 'other',
+									},
+								],
+								default: 'responseIsEmpty',
+								description: 'When should no further requests be made?',
+							},
+							{
+								displayName: 'Status Code(s) when Complete',
+								name: 'statusCodesWhenComplete',
+								type: 'string',
+								typeOptions: {
+									noDataExpression: true,
+								},
+								displayOptions: {
+									show: {
+										paginationCompleteWhen: ['receiveSpecificStatusCodes'],
+									},
+								},
+								default: '',
+								description: 'Accepts comma-separated values',
+							},
+							{
+								displayName: 'Complete Expression',
+								name: 'completeExpression',
+								type: 'string',
+								displayOptions: {
+									show: {
+										paginationCompleteWhen: ['other'],
+									},
+								},
+								default: '',
+								description:
+									'Should evaluate to true when pagination is complete. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/#pagination" target="_blank">More info</a>.',
+							},
+							{
+								displayName: 'Limit Pages Fetched',
+								name: 'limitPagesFetched',
+								type: 'boolean',
+								typeOptions: {
+									noDataExpression: true,
+								},
+								displayOptions: {
+									hide: {
+										paginationMode: ['off'],
+									},
+								},
+								default: false,
+								noDataExpression: true,
+								description: 'Whether the number of requests should be limited',
+							},
+							{
+								displayName: 'Max Pages',
+								name: 'maxRequests',
+								type: 'number',
+								typeOptions: {
+									noDataExpression: true,
+								},
+								displayOptions: {
+									show: {
+										limitPagesFetched: [true],
+									},
+								},
+								default: 100,
+								description: 'Maximum amount of request to be make',
+							},
+							{
+								// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+								displayName: 'Interval Between Requests (ms)',
+								name: 'requestInterval',
+								type: 'number',
+								displayOptions: {
+									hide: {
+										paginationMode: ['off'],
+									},
+								},
+								default: 0,
+								description: 'Time in milliseconds to wait between requests',
+								hint: 'At 0 no delay will be added',
+								typeOptions: {
+									minValue: 0,
+								},
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Proxy',
+				name: 'proxy',
+				type: 'string',
+				default: '',
+				placeholder: 'e.g. http://myproxy:3128',
+				description: 'HTTP proxy to use',
+			},
+			{
+				displayName: 'Timeout',
+				name: 'timeout',
+				type: 'number',
+				typeOptions: {
+					minValue: 1,
+				},
+				default: 10000,
+				description:
+					'Time in ms to wait for the server to send response headers (and start the response body) before aborting the request',
+			},
+		],
+	},
+	{
+		displayName:
+			"You can view the raw requests this node makes in your browser's developer console",
+		name: 'infoMessage',
+		type: 'notice',
+		default: '',
+	},
+];
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 9ff67f9481..7ef4b5b3b6 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -1,5 +1,4 @@
-import type { Readable } from 'stream';
-
+import set from 'lodash/set';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -14,7 +13,6 @@ import type {
 	IRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
-
 import {
 	BINARY_ENCODING,
 	NodeApiError,
@@ -25,8 +23,10 @@ import {
 	removeCircularRefs,
 	sleep,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
+
+import { keysToLowercase } from '@utils/utilities';
 
-import set from 'lodash/set';
 import type { BodyParameter, IAuthDataSanitizeKeys } from '../GenericFunctions';
 import {
 	binaryContentTypes,
@@ -38,8 +38,7 @@ import {
 	sanitizeUiMessage,
 	setAgentOptions,
 } from '../GenericFunctions';
-import { keysToLowercase } from '@utils/utilities';
-import { type HttpSslAuthCredentials } from '../interfaces';
+import { mainProperties } from './Description';
 
 function toText<T>(data: T) {
 	if (typeof data === 'object' && data !== null) {
@@ -72,1182 +71,7 @@ export class HttpRequestV3 implements INodeType {
 					},
 				},
 			],
-			properties: [
-				{
-					displayName: '',
-					name: 'curlImport',
-					type: 'curlImport',
-					default: '',
-				},
-				{
-					displayName: 'Method',
-					name: 'method',
-					type: 'options',
-					options: [
-						{
-							name: 'DELETE',
-							value: 'DELETE',
-						},
-						{
-							name: 'GET',
-							value: 'GET',
-						},
-						{
-							name: 'HEAD',
-							value: 'HEAD',
-						},
-						{
-							name: 'OPTIONS',
-							value: 'OPTIONS',
-						},
-						{
-							name: 'PATCH',
-							value: 'PATCH',
-						},
-						{
-							name: 'POST',
-							value: 'POST',
-						},
-						{
-							name: 'PUT',
-							value: 'PUT',
-						},
-					],
-					default: 'GET',
-					description: 'The request method to use',
-				},
-				{
-					displayName: 'URL',
-					name: 'url',
-					type: 'string',
-					default: '',
-					placeholder: 'http://example.com/index.html',
-					description: 'The URL to make the request to',
-					required: true,
-				},
-				{
-					displayName: 'Authentication',
-					name: 'authentication',
-					noDataExpression: true,
-					type: 'options',
-					options: [
-						{
-							name: 'None',
-							value: 'none',
-						},
-						{
-							name: 'Predefined Credential Type',
-							value: 'predefinedCredentialType',
-							description:
-								"We've already implemented auth for many services so that you don't have to set it up manually",
-						},
-						{
-							name: 'Generic Credential Type',
-							value: 'genericCredentialType',
-							description: 'Fully customizable. Choose between basic, header, OAuth2, etc.',
-						},
-					],
-					default: 'none',
-				},
-				{
-					displayName: 'Credential Type',
-					name: 'nodeCredentialType',
-					type: 'credentialsSelect',
-					noDataExpression: true,
-					required: true,
-					default: '',
-					credentialTypes: ['extends:oAuth2Api', 'extends:oAuth1Api', 'has:authenticate'],
-					displayOptions: {
-						show: {
-							authentication: ['predefinedCredentialType'],
-						},
-					},
-				},
-				{
-					displayName:
-						'Make sure you have specified the scope(s) for the Service Account in the credential',
-					name: 'googleApiWarning',
-					type: 'notice',
-					default: '',
-					displayOptions: {
-						show: {
-							nodeCredentialType: ['googleApi'],
-						},
-					},
-				},
-				{
-					displayName: 'Generic Auth Type',
-					name: 'genericAuthType',
-					type: 'credentialsSelect',
-					required: true,
-					default: '',
-					credentialTypes: ['has:genericAuth'],
-					displayOptions: {
-						show: {
-							authentication: ['genericCredentialType'],
-						},
-					},
-				},
-				{
-					displayName: 'SSL Certificates',
-					name: 'provideSslCertificates',
-					type: 'boolean',
-					default: false,
-					isNodeSetting: true,
-				},
-				{
-					displayName: "Provide certificates in node's 'Credential for SSL Certificates' parameter",
-					name: 'provideSslCertificatesNotice',
-					type: 'notice',
-					default: '',
-					isNodeSetting: true,
-					displayOptions: {
-						show: {
-							provideSslCertificates: [true],
-						},
-					},
-				},
-				{
-					displayName: 'SSL Certificate',
-					name: 'sslCertificate',
-					type: 'credentials',
-					default: '',
-					displayOptions: {
-						show: {
-							provideSslCertificates: [true],
-						},
-					},
-				},
-				{
-					displayName: 'Send Query Parameters',
-					name: 'sendQuery',
-					type: 'boolean',
-					default: false,
-					noDataExpression: true,
-					description: 'Whether the request has query params or not',
-				},
-				{
-					displayName: 'Specify Query Parameters',
-					name: 'specifyQuery',
-					type: 'options',
-					displayOptions: {
-						show: {
-							sendQuery: [true],
-						},
-					},
-					options: [
-						{
-							name: 'Using Fields Below',
-							value: 'keypair',
-						},
-						{
-							name: 'Using JSON',
-							value: 'json',
-						},
-					],
-					default: 'keypair',
-				},
-				{
-					displayName: 'Query Parameters',
-					name: 'queryParameters',
-					type: 'fixedCollection',
-					displayOptions: {
-						show: {
-							sendQuery: [true],
-							specifyQuery: ['keypair'],
-						},
-					},
-					typeOptions: {
-						multipleValues: true,
-					},
-					placeholder: 'Add Parameter',
-					default: {
-						parameters: [
-							{
-								name: '',
-								value: '',
-							},
-						],
-					},
-					options: [
-						{
-							name: 'parameters',
-							displayName: 'Parameter',
-							values: [
-								{
-									displayName: 'Name',
-									name: 'name',
-									type: 'string',
-									default: '',
-								},
-								{
-									displayName: 'Value',
-									name: 'value',
-									type: 'string',
-									default: '',
-								},
-							],
-						},
-					],
-				},
-				{
-					displayName: 'JSON',
-					name: 'jsonQuery',
-					type: 'json',
-					displayOptions: {
-						show: {
-							sendQuery: [true],
-							specifyQuery: ['json'],
-						},
-					},
-					default: '',
-				},
-				{
-					displayName: 'Send Headers',
-					name: 'sendHeaders',
-					type: 'boolean',
-					default: false,
-					noDataExpression: true,
-					description: 'Whether the request has headers or not',
-				},
-				{
-					displayName: 'Specify Headers',
-					name: 'specifyHeaders',
-					type: 'options',
-					displayOptions: {
-						show: {
-							sendHeaders: [true],
-						},
-					},
-					options: [
-						{
-							name: 'Using Fields Below',
-							value: 'keypair',
-						},
-						{
-							name: 'Using JSON',
-							value: 'json',
-						},
-					],
-					default: 'keypair',
-				},
-				{
-					displayName: 'Header Parameters',
-					name: 'headerParameters',
-					type: 'fixedCollection',
-					displayOptions: {
-						show: {
-							sendHeaders: [true],
-							specifyHeaders: ['keypair'],
-						},
-					},
-					typeOptions: {
-						multipleValues: true,
-					},
-					placeholder: 'Add Parameter',
-					default: {
-						parameters: [
-							{
-								name: '',
-								value: '',
-							},
-						],
-					},
-					options: [
-						{
-							name: 'parameters',
-							displayName: 'Parameter',
-							values: [
-								{
-									displayName: 'Name',
-									name: 'name',
-									type: 'string',
-									default: '',
-								},
-								{
-									displayName: 'Value',
-									name: 'value',
-									type: 'string',
-									default: '',
-								},
-							],
-						},
-					],
-				},
-				{
-					displayName: 'JSON',
-					name: 'jsonHeaders',
-					type: 'json',
-					displayOptions: {
-						show: {
-							sendHeaders: [true],
-							specifyHeaders: ['json'],
-						},
-					},
-					default: '',
-				},
-				{
-					displayName: 'Send Body',
-					name: 'sendBody',
-					type: 'boolean',
-					default: false,
-					noDataExpression: true,
-					description: 'Whether the request has a body or not',
-				},
-				{
-					displayName: 'Body Content Type',
-					name: 'contentType',
-					type: 'options',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-						},
-					},
-					options: [
-						{
-							name: 'Form Urlencoded',
-							value: 'form-urlencoded',
-						},
-						{
-							name: 'Form-Data',
-							value: 'multipart-form-data',
-						},
-						{
-							name: 'JSON',
-							value: 'json',
-						},
-						{
-							// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-							name: 'n8n Binary File',
-							value: 'binaryData',
-						},
-						{
-							name: 'Raw',
-							value: 'raw',
-						},
-					],
-					default: 'json',
-					description: 'Content-Type to use to send body parameters',
-				},
-				{
-					displayName: 'Specify Body',
-					name: 'specifyBody',
-					type: 'options',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['json'],
-						},
-					},
-					options: [
-						{
-							name: 'Using Fields Below',
-							value: 'keypair',
-						},
-						{
-							name: 'Using JSON',
-							value: 'json',
-						},
-					],
-					default: 'keypair',
-					// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-json
-					description:
-						'The body can be specified using explicit fields (<code>keypair</code>) or using a JavaScript object (<code>json</code>)',
-				},
-				{
-					displayName: 'Body Parameters',
-					name: 'bodyParameters',
-					type: 'fixedCollection',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['json'],
-							specifyBody: ['keypair'],
-						},
-					},
-					typeOptions: {
-						multipleValues: true,
-					},
-					placeholder: 'Add Parameter',
-					default: {
-						parameters: [
-							{
-								name: '',
-								value: '',
-							},
-						],
-					},
-					options: [
-						{
-							name: 'parameters',
-							displayName: 'Parameter',
-							values: [
-								{
-									displayName: 'Name',
-									name: 'name',
-									type: 'string',
-									default: '',
-									description:
-										'ID of the field to set. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-								},
-								{
-									displayName: 'Value',
-									name: 'value',
-									type: 'string',
-									default: '',
-									description: 'Value of the field to set',
-								},
-							],
-						},
-					],
-				},
-				{
-					displayName: 'JSON',
-					name: 'jsonBody',
-					type: 'json',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['json'],
-							specifyBody: ['json'],
-						},
-					},
-					default: '',
-				},
-				{
-					displayName: 'Body Parameters',
-					name: 'bodyParameters',
-					type: 'fixedCollection',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['multipart-form-data'],
-						},
-					},
-					typeOptions: {
-						multipleValues: true,
-					},
-					placeholder: 'Add Parameter',
-					default: {
-						parameters: [
-							{
-								name: '',
-								value: '',
-							},
-						],
-					},
-					options: [
-						{
-							name: 'parameters',
-							displayName: 'Parameter',
-							values: [
-								{
-									displayName: 'Parameter Type',
-									name: 'parameterType',
-									type: 'options',
-									options: [
-										{
-											// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-											name: 'n8n Binary File',
-											value: 'formBinaryData',
-										},
-										{
-											name: 'Form Data',
-											value: 'formData',
-										},
-									],
-									default: 'formData',
-								},
-								{
-									displayName: 'Name',
-									name: 'name',
-									type: 'string',
-									default: '',
-									description:
-										'ID of the field to set. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-								},
-								{
-									displayName: 'Value',
-									name: 'value',
-									type: 'string',
-									displayOptions: {
-										show: {
-											parameterType: ['formData'],
-										},
-									},
-									default: '',
-									description: 'Value of the field to set',
-								},
-								{
-									displayName: 'Input Data Field Name',
-									name: 'inputDataFieldName',
-									type: 'string',
-									displayOptions: {
-										show: {
-											parameterType: ['formBinaryData'],
-										},
-									},
-									default: '',
-									description:
-										'The name of the incoming field containing the binary file data to be processed',
-								},
-							],
-						},
-					],
-				},
-				{
-					displayName: 'Specify Body',
-					name: 'specifyBody',
-					type: 'options',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['form-urlencoded'],
-						},
-					},
-					options: [
-						{
-							name: 'Using Fields Below',
-							value: 'keypair',
-						},
-						{
-							name: 'Using Single Field',
-							value: 'string',
-						},
-					],
-					default: 'keypair',
-				},
-				{
-					displayName: 'Body Parameters',
-					name: 'bodyParameters',
-					type: 'fixedCollection',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['form-urlencoded'],
-							specifyBody: ['keypair'],
-						},
-					},
-					typeOptions: {
-						multipleValues: true,
-					},
-					placeholder: 'Add Parameter',
-					default: {
-						parameters: [
-							{
-								name: '',
-								value: '',
-							},
-						],
-					},
-					options: [
-						{
-							name: 'parameters',
-							displayName: 'Parameter',
-							values: [
-								{
-									displayName: 'Name',
-									name: 'name',
-									type: 'string',
-									default: '',
-									description:
-										'ID of the field to set. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-								},
-								{
-									displayName: 'Value',
-									name: 'value',
-									type: 'string',
-									default: '',
-									description: 'Value of the field to set',
-								},
-							],
-						},
-					],
-				},
-				{
-					displayName: 'Body',
-					name: 'body',
-					type: 'string',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							specifyBody: ['string'],
-						},
-					},
-					default: '',
-					placeholder: 'field1=value1&field2=value2',
-				},
-				{
-					displayName: 'Input Data Field Name',
-					name: 'inputDataFieldName',
-					type: 'string',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['binaryData'],
-						},
-					},
-					default: '',
-					description:
-						'The name of the incoming field containing the binary file data to be processed',
-				},
-				{
-					displayName: 'Content Type',
-					name: 'rawContentType',
-					type: 'string',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['raw'],
-						},
-					},
-					default: '',
-					placeholder: 'text/html',
-				},
-				{
-					displayName: 'Body',
-					name: 'body',
-					type: 'string',
-					displayOptions: {
-						show: {
-							sendBody: [true],
-							contentType: ['raw'],
-						},
-					},
-					default: '',
-					placeholder: '',
-				},
-				{
-					displayName: 'Options',
-					name: 'options',
-					type: 'collection',
-					placeholder: 'Add option',
-					default: {},
-					options: [
-						{
-							displayName: 'Batching',
-							name: 'batching',
-							placeholder: 'Add Batching',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: false,
-							},
-							default: {
-								batch: {},
-							},
-							options: [
-								{
-									displayName: 'Batching',
-									name: 'batch',
-									values: [
-										{
-											displayName: 'Items per Batch',
-											name: 'batchSize',
-											type: 'number',
-											typeOptions: {
-												minValue: -1,
-											},
-											default: 50,
-											description:
-												'Input will be split in batches to throttle requests. -1 for disabled. 0 will be treated as 1.',
-										},
-										{
-											// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-											displayName: 'Batch Interval (ms)',
-											name: 'batchInterval',
-											type: 'number',
-											typeOptions: {
-												minValue: 0,
-											},
-											default: 1000,
-											description:
-												'Time (in milliseconds) between each batch of requests. 0 for disabled.',
-										},
-									],
-								},
-							],
-						},
-						{
-							displayName: 'Ignore SSL Issues',
-							name: 'allowUnauthorizedCerts',
-							type: 'boolean',
-							noDataExpression: true,
-							default: false,
-							// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-ignore-ssl-issues
-							description:
-								'Whether to download the response even if SSL certificate validation is not possible',
-						},
-						{
-							displayName: 'Array Format in Query Parameters',
-							name: 'queryParameterArrays',
-							type: 'options',
-							displayOptions: {
-								show: {
-									'/sendQuery': [true],
-								},
-							},
-							options: [
-								{
-									name: 'No Brackets',
-									value: 'repeat',
-									// eslint-disable-next-line n8n-nodes-base/node-param-description-lowercase-first-char
-									description: 'e.g. foo=bar&foo=qux',
-								},
-								{
-									name: 'Brackets Only',
-									value: 'brackets',
-									// eslint-disable-next-line n8n-nodes-base/node-param-description-lowercase-first-char
-									description: 'e.g. foo[]=bar&foo[]=qux',
-								},
-								{
-									name: 'Brackets with Indices',
-									value: 'indices',
-									// eslint-disable-next-line n8n-nodes-base/node-param-description-lowercase-first-char
-									description: 'e.g. foo[0]=bar&foo[1]=qux',
-								},
-							],
-							default: 'brackets',
-						},
-						{
-							displayName: 'Lowercase Headers',
-							name: 'lowercaseHeaders',
-							type: 'boolean',
-							default: true,
-							description: 'Whether to lowercase header names',
-						},
-						{
-							displayName: 'Redirects',
-							name: 'redirect',
-							placeholder: 'Add Redirect',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: false,
-							},
-							default: { redirect: {} },
-							options: [
-								{
-									displayName: 'Redirect',
-									name: 'redirect',
-									values: [
-										{
-											displayName: 'Follow Redirects',
-											name: 'followRedirects',
-											type: 'boolean',
-											default: false,
-											noDataExpression: true,
-											description: 'Whether to follow all redirects',
-										},
-										{
-											displayName: 'Max Redirects',
-											name: 'maxRedirects',
-											type: 'number',
-											displayOptions: {
-												show: {
-													followRedirects: [true],
-												},
-											},
-											default: 21,
-											description: 'Max number of redirects to follow',
-										},
-									],
-								},
-							],
-							displayOptions: {
-								show: {
-									'@version': [1, 2, 3],
-								},
-							},
-						},
-						{
-							displayName: 'Redirects',
-							name: 'redirect',
-							placeholder: 'Add Redirect',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: false,
-							},
-							default: {
-								redirect: {},
-							},
-							options: [
-								{
-									displayName: 'Redirect',
-									name: 'redirect',
-									values: [
-										{
-											displayName: 'Follow Redirects',
-											name: 'followRedirects',
-											type: 'boolean',
-											default: true,
-											noDataExpression: true,
-											description: 'Whether to follow all redirects',
-										},
-										{
-											displayName: 'Max Redirects',
-											name: 'maxRedirects',
-											type: 'number',
-											displayOptions: {
-												show: {
-													followRedirects: [true],
-												},
-											},
-											default: 21,
-											description: 'Max number of redirects to follow',
-										},
-									],
-								},
-							],
-							displayOptions: {
-								hide: {
-									'@version': [1, 2, 3],
-								},
-							},
-						},
-						{
-							displayName: 'Response',
-							name: 'response',
-							placeholder: 'Add response',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: false,
-							},
-							default: {
-								response: {},
-							},
-							options: [
-								{
-									displayName: 'Response',
-									name: 'response',
-									values: [
-										{
-											displayName: 'Include Response Headers and Status',
-											name: 'fullResponse',
-											type: 'boolean',
-											default: false,
-											description:
-												'Whether to return the full response (headers and response status code) data instead of only the body',
-										},
-										{
-											displayName: 'Never Error',
-											name: 'neverError',
-											type: 'boolean',
-											default: false,
-											description: 'Whether to succeeds also when status code is not 2xx',
-										},
-										{
-											displayName: 'Response Format',
-											name: 'responseFormat',
-											type: 'options',
-											noDataExpression: true,
-											options: [
-												{
-													name: 'Autodetect',
-													value: 'autodetect',
-												},
-												{
-													name: 'File',
-													value: 'file',
-												},
-												{
-													name: 'JSON',
-													value: 'json',
-												},
-												{
-													name: 'Text',
-													value: 'text',
-												},
-											],
-											default: 'autodetect',
-											description: 'The format in which the data gets returned from the URL',
-										},
-										{
-											displayName: 'Put Output in Field',
-											name: 'outputPropertyName',
-											type: 'string',
-											default: 'data',
-											required: true,
-											displayOptions: {
-												show: {
-													responseFormat: ['file', 'text'],
-												},
-											},
-											description:
-												'Name of the binary property to which to write the data of the read file',
-										},
-									],
-								},
-							],
-						},
-						{
-							displayName: 'Pagination',
-							name: 'pagination',
-							placeholder: 'Add pagination',
-							type: 'fixedCollection',
-							typeOptions: {
-								multipleValues: false,
-							},
-							default: {
-								pagination: {},
-							},
-							options: [
-								{
-									displayName: 'Pagination',
-									name: 'pagination',
-									values: [
-										{
-											displayName: 'Pagination Mode',
-											name: 'paginationMode',
-											type: 'options',
-											typeOptions: {
-												noDataExpression: true,
-											},
-											options: [
-												{
-													name: 'Off',
-													value: 'off',
-												},
-												{
-													name: 'Update a Parameter in Each Request',
-													value: 'updateAParameterInEachRequest',
-												},
-												{
-													name: 'Response Contains Next URL',
-													value: 'responseContainsNextURL',
-												},
-											],
-											default: 'updateAParameterInEachRequest',
-											description: 'If pagination should be used',
-										},
-										{
-											displayName:
-												'Use the $response variables to access the data of the previous response. Refer to the <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/#pagination/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.httpRequest" target="_blank">docs</a> for more info about pagination/',
-											name: 'webhookNotice',
-											displayOptions: {
-												hide: {
-													paginationMode: ['off'],
-												},
-											},
-											type: 'notice',
-											default: '',
-										},
-										{
-											displayName: 'Next URL',
-											name: 'nextURL',
-											type: 'string',
-											displayOptions: {
-												show: {
-													paginationMode: ['responseContainsNextURL'],
-												},
-											},
-											default: '',
-											description:
-												'Should evaluate to the URL of the next page. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/#pagination" target="_blank">More info</a>.',
-										},
-										{
-											displayName: 'Parameters',
-											name: 'parameters',
-											type: 'fixedCollection',
-											displayOptions: {
-												show: {
-													paginationMode: ['updateAParameterInEachRequest'],
-												},
-											},
-											typeOptions: {
-												multipleValues: true,
-												noExpression: true,
-											},
-											placeholder: 'Add Parameter',
-											default: {
-												parameters: [
-													{
-														type: 'qs',
-														name: '',
-														value: '',
-													},
-												],
-											},
-											options: [
-												{
-													name: 'parameters',
-													displayName: 'Parameter',
-													values: [
-														{
-															displayName: 'Type',
-															name: 'type',
-															type: 'options',
-															options: [
-																{
-																	name: 'Body',
-																	value: 'body',
-																},
-																{
-																	name: 'Header',
-																	value: 'headers',
-																},
-																{
-																	name: 'Query',
-																	value: 'qs',
-																},
-															],
-															default: 'qs',
-															description: 'Where the parameter should be set',
-														},
-														{
-															displayName: 'Name',
-															name: 'name',
-															type: 'string',
-															default: '',
-															placeholder: 'e.g page',
-														},
-														{
-															displayName: 'Value',
-															name: 'value',
-															type: 'string',
-															default: '',
-															hint: 'Use expression mode and $response to access response data',
-														},
-													],
-												},
-											],
-										},
-										{
-											displayName: 'Pagination Complete When',
-											name: 'paginationCompleteWhen',
-											type: 'options',
-											typeOptions: {
-												noDataExpression: true,
-											},
-											displayOptions: {
-												hide: {
-													paginationMode: ['off'],
-												},
-											},
-											options: [
-												{
-													name: 'Response Is Empty',
-													value: 'responseIsEmpty',
-												},
-												{
-													name: 'Receive Specific Status Code(s)',
-													value: 'receiveSpecificStatusCodes',
-												},
-												{
-													name: 'Other',
-													value: 'other',
-												},
-											],
-											default: 'responseIsEmpty',
-											description: 'When should no further requests be made?',
-										},
-										{
-											displayName: 'Status Code(s) when Complete',
-											name: 'statusCodesWhenComplete',
-											type: 'string',
-											typeOptions: {
-												noDataExpression: true,
-											},
-											displayOptions: {
-												show: {
-													paginationCompleteWhen: ['receiveSpecificStatusCodes'],
-												},
-											},
-											default: '',
-											description: 'Accepts comma-separated values',
-										},
-										{
-											displayName: 'Complete Expression',
-											name: 'completeExpression',
-											type: 'string',
-											displayOptions: {
-												show: {
-													paginationCompleteWhen: ['other'],
-												},
-											},
-											default: '',
-											description:
-												'Should evaluate to true when pagination is complete. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.httprequest/#pagination" target="_blank">More info</a>.',
-										},
-										{
-											displayName: 'Limit Pages Fetched',
-											name: 'limitPagesFetched',
-											type: 'boolean',
-											typeOptions: {
-												noDataExpression: true,
-											},
-											displayOptions: {
-												hide: {
-													paginationMode: ['off'],
-												},
-											},
-											default: false,
-											noDataExpression: true,
-											description: 'Whether the number of requests should be limited',
-										},
-										{
-											displayName: 'Max Pages',
-											name: 'maxRequests',
-											type: 'number',
-											typeOptions: {
-												noDataExpression: true,
-											},
-											displayOptions: {
-												show: {
-													limitPagesFetched: [true],
-												},
-											},
-											default: 100,
-											description: 'Maximum amount of request to be make',
-										},
-										{
-											// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-											displayName: 'Interval Between Requests (ms)',
-											name: 'requestInterval',
-											type: 'number',
-											displayOptions: {
-												hide: {
-													paginationMode: ['off'],
-												},
-											},
-											default: 0,
-											description: 'Time in milliseconds to wait between requests',
-											hint: 'At 0 no delay will be added',
-											typeOptions: {
-												minValue: 0,
-											},
-										},
-									],
-								},
-							],
-						},
-						{
-							displayName: 'Proxy',
-							name: 'proxy',
-							type: 'string',
-							default: '',
-							placeholder: 'e.g. http://myproxy:3128',
-							description: 'HTTP proxy to use',
-						},
-						{
-							displayName: 'Timeout',
-							name: 'timeout',
-							type: 'number',
-							typeOptions: {
-								minValue: 1,
-							},
-							default: 10000,
-							description:
-								'Time in ms to wait for the server to send response headers (and start the response body) before aborting the request',
-						},
-					],
-				},
-				{
-					displayName:
-						"You can view the raw requests this node makes in your browser's developer console",
-					name: 'infoMessage',
-					type: 'notice',
-					default: '',
-				},
-			],
+			properties: mainProperties,
 		};
 	}
 
@@ -1345,10 +169,7 @@ export class HttpRequestV3 implements INodeType {
 			);
 
 			if (provideSslCertificates) {
-				sslCertificates = (await this.getCredentials(
-					'httpSslAuth',
-					itemIndex,
-				)) as HttpSslAuthCredentials;
+				sslCertificates = await this.getCredentials('httpSslAuth', itemIndex);
 			}
 
 			const requestMethod = this.getNodeParameter('method', itemIndex) as IHttpRequestMethods;
@@ -1519,7 +340,7 @@ export class HttpRequestV3 implements INodeType {
 						} catch {
 							throw new NodeOperationError(
 								this.getNode(),
-								'JSON parameter need to be an valid JSON',
+								'JSON parameter needs to be valid JSON',
 								{
 									itemIndex,
 								},
@@ -1583,13 +404,9 @@ export class HttpRequestV3 implements INodeType {
 					try {
 						JSON.parse(jsonQueryParameter);
 					} catch {
-						throw new NodeOperationError(
-							this.getNode(),
-							'JSON parameter need to be an valid JSON',
-							{
-								itemIndex,
-							},
-						);
+						throw new NodeOperationError(this.getNode(), 'JSON parameter needs to be valid JSON', {
+							itemIndex,
+						});
 					}
 
 					requestOptions.qs = jsonParse(jsonQueryParameter);
@@ -1609,13 +426,9 @@ export class HttpRequestV3 implements INodeType {
 					try {
 						JSON.parse(jsonHeadersParameter);
 					} catch {
-						throw new NodeOperationError(
-							this.getNode(),
-							'JSON parameter need to be an valid JSON',
-							{
-								itemIndex,
-							},
-						);
+						throw new NodeOperationError(this.getNode(), 'JSON parameter needs to be valid JSON', {
+							itemIndex,
+						});
 					}
 
 					additionalHeaders = jsonParse(jsonHeadersParameter);
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequestV3.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequestV3.test.ts
new file mode 100644
index 0000000000..d245c77e7f
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequestV3.test.ts
@@ -0,0 +1,229 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { IExecuteFunctions, INodeTypeBaseDescription } from 'n8n-workflow';
+
+import { HttpRequestV3 } from '../../V3/HttpRequestV3.node';
+
+describe('HttpRequestV3', () => {
+	let node: HttpRequestV3;
+	let executeFunctions: IExecuteFunctions;
+
+	const baseUrl = 'http://example.com';
+	const options = {
+		redirect: '',
+		batching: { batch: { batchSize: 1, batchInterval: 1 } },
+		proxy: '',
+		timeout: '',
+		allowUnauthoridCerts: '',
+		queryParameterArrays: '',
+		response: '',
+		lowercaseHeaders: '',
+	};
+
+	beforeEach(() => {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'HTTP Request',
+			name: 'httpRequest',
+			description: 'Makes an HTTP request and returns the response data',
+			group: [],
+		};
+		node = new HttpRequestV3(baseDescription);
+		executeFunctions = {
+			getInputData: jest.fn(),
+			getNodeParameter: jest.fn(),
+			getNode: jest.fn(() => {
+				return {
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 3,
+				};
+			}),
+			getCredentials: jest.fn(),
+			helpers: {
+				request: jest.fn(),
+				requestOAuth1: jest.fn(
+					async () =>
+						await Promise.resolve({
+							statusCode: 200,
+							headers: { 'content-type': 'application/json' },
+							body: Buffer.from(JSON.stringify({ success: true })),
+						}),
+				),
+				requestOAuth2: jest.fn(
+					async () =>
+						await Promise.resolve({
+							statusCode: 200,
+							headers: { 'content-type': 'application/json' },
+							body: Buffer.from(JSON.stringify({ success: true })),
+						}),
+				),
+				requestWithAuthentication: jest.fn(),
+				requestWithAuthenticationPaginated: jest.fn(),
+				assertBinaryData: jest.fn(),
+				getBinaryStream: jest.fn(),
+				getBinaryMetadata: jest.fn(),
+				binaryToString: jest.fn((buffer: Buffer) => {
+					return buffer.toString();
+				}),
+				prepareBinaryData: jest.fn(),
+			},
+			getContext: jest.fn(),
+			sendMessageToUI: jest.fn(),
+			continueOnFail: jest.fn(),
+			getMode: jest.fn(),
+		} as unknown as IExecuteFunctions;
+	});
+
+	it('should make a GET request', async () => {
+		(executeFunctions.getInputData as jest.Mock).mockReturnValue([{ json: {} }]);
+		(executeFunctions.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+			switch (paramName) {
+				case 'method':
+					return 'GET';
+				case 'url':
+					return baseUrl;
+				case 'authentication':
+					return 'none';
+				case 'options':
+					return options;
+				default:
+					return undefined;
+			}
+		});
+		const response = {
+			headers: { 'content-type': 'application/json' },
+			body: Buffer.from(JSON.stringify({ success: true })),
+		};
+
+		(executeFunctions.helpers.request as jest.Mock).mockResolvedValue(response);
+
+		const result = await node.execute.call(executeFunctions);
+
+		expect(result).toEqual([[{ json: { success: true }, pairedItem: { item: 0 } }]]);
+	});
+
+	it('should handle authentication', async () => {
+		(executeFunctions.getInputData as jest.Mock).mockReturnValue([{ json: {} }]);
+		(executeFunctions.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+			switch (paramName) {
+				case 'method':
+					return 'GET';
+				case 'url':
+					return baseUrl;
+				case 'authentication':
+					return 'genericCredentialType';
+				case 'genericAuthType':
+					return 'httpBasicAuth';
+				case 'options':
+					return options;
+				default:
+					return undefined;
+			}
+		});
+		(executeFunctions.getCredentials as jest.Mock).mockResolvedValue({
+			user: 'username',
+			password: 'password',
+		});
+		const response = {
+			headers: { 'content-type': 'application/json' },
+			body: Buffer.from(JSON.stringify({ success: true })),
+		};
+		(executeFunctions.helpers.request as jest.Mock).mockResolvedValue(response);
+
+		const result = await node.execute.call(executeFunctions);
+
+		expect(result).toEqual([[{ json: { success: true }, pairedItem: { item: 0 } }]]);
+		expect(executeFunctions.helpers.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				auth: {
+					user: 'username',
+					pass: 'password',
+				},
+			}),
+		);
+	});
+
+	describe('Authentication Handling', () => {
+		const authenticationTypes = [
+			{
+				genericCredentialType: 'httpBasicAuth',
+				credentials: { user: 'username', password: 'password' },
+				authField: 'auth',
+				authValue: { user: 'username', pass: 'password' },
+			},
+			{
+				genericCredentialType: 'httpDigestAuth',
+				credentials: { user: 'username', password: 'password' },
+				authField: 'auth',
+				authValue: { user: 'username', pass: 'password', sendImmediately: false },
+			},
+			{
+				genericCredentialType: 'httpHeaderAuth',
+				credentials: { name: 'Authorization', value: 'Bearer token' },
+				authField: 'headers',
+				authValue: { Authorization: 'Bearer token' },
+			},
+			{
+				genericCredentialType: 'httpQueryAuth',
+				credentials: { name: 'Token', value: 'secretToken' },
+				authField: 'qs',
+				authValue: { Token: 'secretToken' },
+			},
+			{
+				genericCredentialType: 'oAuth1Api',
+				credentials: { oauth_token: 'token', oauth_token_secret: 'secret' },
+				authField: 'oauth',
+				authValue: { oauth_token: 'token', oauth_token_secret: 'secret' },
+			},
+			{
+				genericCredentialType: 'oAuth2Api',
+				credentials: { access_token: 'accessToken' },
+				authField: 'auth',
+				authValue: { bearer: 'accessToken' },
+			},
+		];
+
+		it.each(authenticationTypes)(
+			'should handle %s authentication',
+			async ({ genericCredentialType, credentials, authField, authValue }) => {
+				(executeFunctions.getInputData as jest.Mock).mockReturnValue([{ json: {} }]);
+				(executeFunctions.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+					switch (paramName) {
+						case 'method':
+							return 'GET';
+						case 'url':
+							return baseUrl;
+						case 'authentication':
+							return 'genericCredentialType';
+						case 'genericAuthType':
+							return genericCredentialType;
+						case 'options':
+							return options;
+						default:
+							return undefined;
+					}
+				});
+
+				(executeFunctions.getCredentials as jest.Mock).mockResolvedValue(credentials);
+				const response = {
+					headers: { 'content-type': 'application/json' },
+					body: Buffer.from(JSON.stringify({ success: true })),
+				};
+				(executeFunctions.helpers.request as jest.Mock).mockResolvedValue(response);
+
+				const result = await node.execute.call(executeFunctions);
+
+				expect(result).toEqual([[{ json: { success: true }, pairedItem: { item: 0 } }]]);
+				if (genericCredentialType === 'oAuth1Api') {
+					expect(executeFunctions.helpers.requestOAuth1).toHaveBeenCalled();
+				} else if (genericCredentialType === 'oAuth2Api') {
+					expect(executeFunctions.helpers.requestOAuth2).toHaveBeenCalled();
+				} else {
+					expect(executeFunctions.helpers.request).toHaveBeenCalledWith(
+						expect.objectContaining({
+							[authField]: expect.objectContaining(authValue),
+						}),
+					);
+				}
+			},
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/HttpRequest/test/utils/utils.test.ts b/packages/nodes-base/nodes/HttpRequest/test/utils/utils.test.ts
index 04c1107893..ae021bf574 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/utils/utils.test.ts
@@ -1,9 +1,17 @@
-import type { IRequestOptions } from 'n8n-workflow';
+import type {
+	ICredentialDataDecryptedObject,
+	INodeExecutionData,
+	INodeProperties,
+	IRequestOptions,
+} from 'n8n-workflow';
+
 import {
 	REDACTED,
 	prepareRequestBody,
 	sanitizeUiMessage,
 	setAgentOptions,
+	replaceNullValues,
+	getSecrets,
 } from '../../GenericFunctions';
 import type { BodyParameter, BodyParametersReducer } from '../../GenericFunctions';
 
@@ -210,4 +218,113 @@ describe('HTTP Node Utils', () => {
 			expect(sanitizedRequest.headers).toBeUndefined();
 		});
 	});
+
+	describe('replaceNullValues', () => {
+		it('should replace null json with an empty object', () => {
+			const item: INodeExecutionData = {
+				json: {},
+			};
+			const result = replaceNullValues(item);
+			expect(result.json).toEqual({});
+		});
+
+		it('should not modify json if it is already an object', () => {
+			const jsonObject = { key: 'value' };
+			const item: INodeExecutionData = { json: jsonObject };
+			const result = replaceNullValues(item);
+			expect(result.json).toBe(jsonObject);
+		});
+	});
+
+	describe('getSecrets', () => {
+		afterEach(() => {
+			jest.clearAllMocks();
+		});
+
+		it('should return secrets for sensitive properties', () => {
+			const properties: INodeProperties[] = [
+				{
+					displayName: 'Api Key',
+					name: 'apiKey',
+					typeOptions: { password: true },
+					type: 'string',
+					default: undefined,
+				},
+				{
+					displayName: 'Username',
+					name: 'username',
+					type: 'string',
+					default: undefined,
+				},
+			];
+			const credentials: ICredentialDataDecryptedObject = {
+				apiKey: 'sensitive-api-key',
+				username: 'user123',
+			};
+
+			const secrets = getSecrets(properties, credentials);
+			expect(secrets).toEqual(['sensitive-api-key']);
+		});
+
+		it('should not return non-sensitive properties', () => {
+			const properties: INodeProperties[] = [
+				{
+					displayName: 'Username',
+					name: 'username',
+					type: 'string',
+					default: undefined,
+				},
+			];
+			const credentials: ICredentialDataDecryptedObject = {
+				username: 'user123',
+			};
+
+			const secrets = getSecrets(properties, credentials);
+			expect(secrets).toEqual([]);
+		});
+
+		it('should not include non-string values in sensitive properties', () => {
+			const properties: INodeProperties[] = [
+				{
+					displayName: 'ApiKey',
+					name: 'apiKey',
+					typeOptions: { password: true },
+					type: 'string',
+					default: undefined,
+				},
+			];
+			const credentials: ICredentialDataDecryptedObject = {
+				apiKey: 12345,
+			};
+
+			const secrets = getSecrets(properties, credentials);
+			expect(secrets).toEqual([]);
+		});
+
+		it('should return an empty array if properties and credentials are empty', () => {
+			const properties: INodeProperties[] = [];
+			const credentials: ICredentialDataDecryptedObject = {};
+
+			const secrets = getSecrets(properties, credentials);
+			expect(secrets).toEqual([]);
+		});
+
+		it('should not include null or undefined values in sensitive properties', () => {
+			const properties: INodeProperties[] = [
+				{
+					displayName: 'ApiKey',
+					name: 'apiKey',
+					typeOptions: { password: true },
+					type: 'string',
+					default: undefined,
+				},
+			];
+			const credentials: ICredentialDataDecryptedObject = {
+				apiKey: {},
+			};
+
+			const secrets = getSecrets(properties, credentials);
+			expect(secrets).toEqual([]);
+		});
+	});
 });
diff --git a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
index 4cfd4f1aef..99e2bcf816 100644
--- a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
+++ b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
@@ -28,7 +28,6 @@ export const description: INodeProperties[] = [
 		required: true,
 		description:
 			'Date and time at which the event begins. (For all-day events, the time will be ignored.).',
-		validateType: 'dateTime',
 	},
 	{
 		displayName: 'End',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/ClientDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/ClientDescription.ts
index 29d036aa92..ef5a9a34e5 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/ClientDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/ClientDescription.ts
@@ -394,6 +394,44 @@ export const clientFields: INodeProperties[] = [
 				],
 				default: 'invoices',
 			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'active',
+					},
+					{
+						name: 'Archived',
+						value: 'archived',
+					},
+					{
+						name: 'Deleted',
+						value: 'deleted',
+					},
+				],
+				default: 'active',
+			},
+			{
+				displayName: 'Created At',
+				name: 'createdAt',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Updated At',
+				name: 'updatedAt',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Is Deleted',
+				name: 'isDeleted',
+				type: 'boolean',
+				default: false,
+			},
 		],
 	},
 ];
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceDescription.ts
index 783f7d1486..6c4f1a6cdb 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceDescription.ts
@@ -441,6 +441,68 @@ export const invoiceFields: INodeProperties[] = [
 				],
 				default: 'client',
 			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'active',
+					},
+					{
+						name: 'Archived',
+						value: 'archived',
+					},
+					{
+						name: 'Deleted',
+						value: 'deleted',
+					},
+				],
+				default: 'active',
+			},
+			{
+				displayName: 'Created At',
+				name: 'createdAt',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Updated At',
+				name: 'updatedAt',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Is Deleted',
+				name: 'isDeleted',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Client Status',
+				name: 'clientStatus',
+				type: 'options',
+				options: [
+					{
+						name: 'All',
+						value: 'all',
+					},
+					{
+						name: 'Paid',
+						value: 'paid',
+					},
+					{
+						name: 'Unpaid',
+						value: 'unpaid',
+					},
+					{
+						name: 'Overdue',
+						value: 'overdue',
+					},
+				],
+				default: 'all',
+			},
 		],
 	},
 ];
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index fd43eb8e86..3702c1e34d 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -434,6 +434,18 @@ export class InvoiceNinja implements INodeType {
 						if (options.include) {
 							qs.include = options.include as string;
 						}
+						if (options.status) {
+							qs.status = options.status as string;
+						}
+						if (options.createdAt) {
+							qs.created_at = options.createdAt as string;
+						}
+						if (options.updatedAt) {
+							qs.updated_at = options.updatedAt as string;
+						}
+						if (options.isDeleted) {
+							qs.is_deleted = options.isDeleted as boolean;
+						}
 						if (returnAll) {
 							responseData = await invoiceNinjaApiRequestAllItems.call(
 								this,
@@ -619,7 +631,27 @@ export class InvoiceNinja implements INodeType {
 							qs.include = options.include as string;
 						}
 						if (options.invoiceNumber) {
-							qs.invoice_number = options.invoiceNumber as string;
+							if (apiVersion === 'v4') {
+								qs.invoice_number = options.invoiceNumber as string;
+							} else if (apiVersion === 'v5') {
+								// eslint-disable-next-line id-denylist
+								qs.number = options.invoiceNumber as string;
+							}
+						}
+						if (options.status) {
+							qs.status = options.status as string;
+						}
+						if (options.createdAt) {
+							qs.created_at = options.createdAt as string;
+						}
+						if (options.updatedAt) {
+							qs.updated_at = options.updatedAt as string;
+						}
+						if (options.isDeleted) {
+							qs.is_deleted = options.isDeleted as boolean;
+						}
+						if (options.clientStatus) {
+							qs.client_status = options.clientStatus as string;
 						}
 						if (returnAll) {
 							responseData = await invoiceNinjaApiRequestAllItems.call(
@@ -799,6 +831,18 @@ export class InvoiceNinja implements INodeType {
 						if (options.include) {
 							qs.include = options.include as string;
 						}
+						if (options.status) {
+							qs.status = options.status as string;
+						}
+						if (options.createdAt) {
+							qs.created_at = options.createdAt as string;
+						}
+						if (options.updatedAt) {
+							qs.updated_at = options.updatedAt as string;
+						}
+						if (options.isDeleted) {
+							qs.is_deleted = options.isDeleted as boolean;
+						}
 						if (returnAll) {
 							responseData = await invoiceNinjaApiRequestAllItems.call(
 								this,
@@ -1178,6 +1222,18 @@ export class InvoiceNinja implements INodeType {
 						if (options.invoiceNumber) {
 							qs.invoice_number = options.invoiceNumber as string;
 						}
+						if (options.status) {
+							qs.status = options.status as string;
+						}
+						if (options.createdAt) {
+							qs.created_at = options.createdAt as string;
+						}
+						if (options.updatedAt) {
+							qs.updated_at = options.updatedAt as string;
+						}
+						if (options.isDeleted) {
+							qs.is_deleted = options.isDeleted as boolean;
+						}
 						if (returnAll) {
 							responseData = await invoiceNinjaApiRequestAllItems.call(
 								this,
diff --git a/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
index 1e6188f350..99a683ecb2 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
@@ -584,6 +584,44 @@ export const paymentFields: INodeProperties[] = [
 				],
 				default: 'client',
 			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'active',
+					},
+					{
+						name: 'Archived',
+						value: 'archived',
+					},
+					{
+						name: 'Deleted',
+						value: 'deleted',
+					},
+				],
+				default: 'active',
+			},
+			{
+				displayName: 'Created At',
+				name: 'createdAt',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Updated At',
+				name: 'updatedAt',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Is Deleted',
+				name: 'isDeleted',
+				type: 'boolean',
+				default: false,
+			},
 		],
 	},
 ];
diff --git a/packages/nodes-base/nodes/InvoiceNinja/QuoteDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/QuoteDescription.ts
index d9a2e281c1..ea40608a5a 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/QuoteDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/QuoteDescription.ts
@@ -435,6 +435,44 @@ export const quoteFields: INodeProperties[] = [
 				],
 				default: 'client',
 			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'active',
+					},
+					{
+						name: 'Archived',
+						value: 'archived',
+					},
+					{
+						name: 'Deleted',
+						value: 'deleted',
+					},
+				],
+				default: 'active',
+			},
+			{
+				displayName: 'Created At',
+				name: 'createdAt',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Updated At',
+				name: 'updatedAt',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Is Deleted',
+				name: 'isDeleted',
+				type: 'boolean',
+				default: false,
+			},
 		],
 	},
 ];
diff --git a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
index 7ecc3cae02..3253c046de 100644
--- a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
@@ -2,8 +2,8 @@ import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHttpRequestMethods,
+	IHttpRequestOptions,
 	ILoadOptionsFunctions,
-	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
@@ -12,7 +12,6 @@ export async function iterableApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
 	resource: string,
-
 	body: any = {},
 	qs: IDataObject = {},
 	uri?: string,
@@ -20,15 +19,14 @@ export async function iterableApiRequest(
 ): Promise<any> {
 	const credentials = await this.getCredentials('iterableApi');
 
-	const options: IRequestOptions = {
+	const options: IHttpRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
-			Api_Key: credentials.apiKey,
 		},
 		method,
 		body,
 		qs,
-		uri: uri || `https://api.iterable.com/api${resource}`,
+		url: uri || `${credentials.region}/api${resource}`,
 		json: true,
 	};
 	try {
@@ -38,8 +36,7 @@ export async function iterableApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
-		return await this.helpers.request.call(this, options);
+		return await this.helpers.httpRequestWithAuthentication.call(this, 'iterableApi', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 8911daeb58..2c21328f78 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -53,6 +53,7 @@ export class Jira implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'jiraSoftwareCloudApi',
diff --git a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
index 88bed5162c..d01bc1ba1a 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
@@ -221,7 +221,7 @@ export class LocalFileTrigger implements INodeType {
 		}
 
 		const watcher = watch(path, {
-			ignored: options.ignored === '' ? undefined : options.ignored,
+			ignored: options.ignored === '' ? undefined : (options.ignored as string),
 			persistent: true,
 			ignoreInitial:
 				options.ignoreInitial === undefined ? true : (options.ignoreInitial as boolean),
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
index 439b2fdcb3..cbcc328fd0 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
@@ -22,6 +22,7 @@ export const description: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	usableAsTool: true,
 	credentials: [
 		{
 			name: 'microsoftOutlookOAuth2Api',
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 619ff95a33..4317dde0e4 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -37,6 +37,7 @@ export class MicrosoftSql implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		parameterPane: 'wide',
 		credentials: [
 			{
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index b9c0a47bb2..756dd72deb 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -45,6 +45,7 @@ export class MongoDb implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'mongoDb',
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
index 103d270cbf..e655acf6f0 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/versionDescription.ts
@@ -16,6 +16,7 @@ export const versionDescription: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	usableAsTool: true,
 	credentials: [
 		{
 			name: 'mySql',
diff --git a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
index b2b82c2842..4224381e1e 100644
--- a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
+++ b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
@@ -6,7 +6,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-type eventType = 'Instance started' | undefined;
+type eventType = 'Instance started' | 'Workflow activated' | 'Workflow updated' | undefined;
 
 export class N8nTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -30,26 +30,46 @@ export class N8nTrigger implements INodeType {
 				type: 'multiOptions',
 				required: true,
 				default: [],
-				description:
-					'Specifies under which conditions an execution should happen: <b>Instance started</b>: Triggers when this n8n instance is started or re-started',
+				description: `Specifies under which conditions an execution should happen:
+				<ul>
+					<li><b>Active Workflow Updated</b>: Triggers when this workflow is updated</li>
+					<li><b>Instance Started</b>:  Triggers when this n8n instance is started or re-started</li>
+					<li><b>Workflow Activated</b>: Triggers when this workflow is activated</li>
+				</ul>`,
 				options: [
+					{
+						name: 'Active Workflow Updated',
+						value: 'update',
+						description: 'Triggers when this workflow is updated',
+					},
 					{
 						name: 'Instance Started',
 						value: 'init',
 						description: 'Triggers when this n8n instance is started or re-started',
 					},
+					{
+						name: 'Workflow Activated',
+						value: 'activate',
+						description: 'Triggers when this workflow is activated',
+					},
 				],
 			},
 		],
 	};
 
 	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
-		const events = this.getNodeParameter('events', []) as string[];
+		const events = (this.getNodeParameter('events') as string[]) || [];
 
 		const activationMode = this.getActivationMode();
 
 		if (events.includes(activationMode)) {
 			let event: eventType;
+			if (activationMode === 'activate') {
+				event = 'Workflow activated';
+			}
+			if (activationMode === 'update') {
+				event = 'Workflow updated';
+			}
 			if (activationMode === 'init') {
 				event = 'Instance started';
 			}
diff --git a/packages/nodes-base/nodes/N8nTrigger/test/trigger.test.ts b/packages/nodes-base/nodes/N8nTrigger/test/trigger.test.ts
new file mode 100644
index 0000000000..43e49554ac
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrigger/test/trigger.test.ts
@@ -0,0 +1,109 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import { N8nTrigger } from '../N8nTrigger.node';
+
+describe('N8nTrigger', () => {
+	let n8nTrigger: N8nTrigger;
+	let mockTriggerFunctions: any;
+
+	beforeEach(() => {
+		n8nTrigger = new N8nTrigger();
+
+		// Mock trigger functions
+		mockTriggerFunctions = {
+			emit: jest.fn(),
+			getNodeParameter: jest.fn(),
+			getActivationMode: jest.fn(),
+			getWorkflow: jest.fn(() => ({ id: 'test-workflow-id' })),
+			helpers: {
+				returnJsonArray: jest.fn((data) => data),
+			},
+		};
+	});
+
+	describe('trigger', () => {
+		it('should emit event when activation mode matches selected events', async () => {
+			mockTriggerFunctions.getNodeParameter.mockReturnValue(['activate']);
+			mockTriggerFunctions.getActivationMode.mockReturnValue('activate');
+
+			await n8nTrigger.trigger.call(mockTriggerFunctions);
+
+			expect(mockTriggerFunctions.emit).toHaveBeenCalledWith([
+				[
+					{
+						event: 'Workflow activated',
+						timestamp: expect.any(String),
+						workflow_id: 'test-workflow-id',
+					},
+				],
+			]);
+		});
+
+		it('should not emit event when activation mode does not match selected events', async () => {
+			mockTriggerFunctions.getNodeParameter.mockReturnValue(['update']);
+			mockTriggerFunctions.getActivationMode.mockReturnValue('activate');
+
+			await n8nTrigger.trigger.call(mockTriggerFunctions);
+
+			expect(mockTriggerFunctions.emit).not.toHaveBeenCalled();
+		});
+
+		it('should return manual trigger function', async () => {
+			const result = await n8nTrigger.trigger.call(mockTriggerFunctions);
+
+			expect(result).toHaveProperty('manualTriggerFunction');
+			expect(typeof result.manualTriggerFunction).toBe('function');
+		});
+
+		it('should emit correct event for instance started', async () => {
+			mockTriggerFunctions.getNodeParameter.mockReturnValue(['init']);
+			mockTriggerFunctions.getActivationMode.mockReturnValue('init');
+
+			await n8nTrigger.trigger.call(mockTriggerFunctions);
+
+			expect(mockTriggerFunctions.emit).toHaveBeenCalledWith([
+				[
+					{
+						event: 'Instance started',
+						timestamp: expect.any(String),
+						workflow_id: 'test-workflow-id',
+					},
+				],
+			]);
+		});
+
+		it('should emit correct event for workflow updated', async () => {
+			mockTriggerFunctions.getNodeParameter.mockReturnValue(['update']);
+			mockTriggerFunctions.getActivationMode.mockReturnValue('update');
+
+			await n8nTrigger.trigger.call(mockTriggerFunctions);
+
+			expect(mockTriggerFunctions.emit).toHaveBeenCalledWith([
+				[
+					{
+						event: 'Workflow updated',
+						timestamp: expect.any(String),
+						workflow_id: 'test-workflow-id',
+					},
+				],
+			]);
+		});
+	});
+
+	describe('description', () => {
+		it('should have correct properties', () => {
+			expect(n8nTrigger.description).toMatchObject({
+				displayName: 'n8n Trigger',
+				name: 'n8nTrigger',
+				group: ['trigger'],
+				version: 1,
+			});
+		});
+
+		it('should have required properties configuration', () => {
+			const eventsProperty = n8nTrigger.description.properties.find((p) => p.name === 'events');
+			expect(eventsProperty).toBeDefined();
+			expect(eventsProperty?.required).toBe(true);
+			expect(eventsProperty?.type).toBe('multiOptions');
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index b291680c59..7088465009 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -1069,7 +1069,7 @@ export class Nasa implements INodeType {
 				if (resource === 'astronomyPictureOfTheDay') {
 					download = this.getNodeParameter('download', 0);
 
-					if (download) {
+					if (download && responseData?.media_type === 'image') {
 						const binaryProperty = this.getNodeParameter('binaryPropertyName', i);
 
 						const data = await nasaApiRequest.call(
@@ -1130,7 +1130,12 @@ export class Nasa implements INodeType {
 
 		if (resource === 'earthImagery' && operation === 'get') {
 			return [items];
-		} else if (resource === 'astronomyPictureOfTheDay' && operation === 'get' && download) {
+		} else if (
+			resource === 'astronomyPictureOfTheDay' &&
+			operation === 'get' &&
+			download &&
+			responseData?.media_type === 'image'
+		) {
 			return [items];
 		} else {
 			return [returnData];
diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
index 390c3e2791..0cadbc5b1d 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
@@ -29,6 +29,7 @@ export class NocoDB implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'nocoDb',
diff --git a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
index ff26f28735..4114d681db 100644
--- a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
@@ -26,6 +26,7 @@ export const versionDescription: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	usableAsTool: true,
 	credentials: [
 		{
 			name: 'notionApi',
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 aff8c740a5..0f97966769 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -46,6 +46,9 @@ const createMockExecuteFunction = (nodeParameters: IDataObject) => {
 			node.parameters = { ...node.parameters, ...(nodeParameters as INodeParameters) };
 			return node;
 		},
+		evaluateExpression(str: string, _: number) {
+			return str.replace('{{', '').replace('}}', '');
+		},
 	} as unknown as IExecuteFunctions;
 	return fakeExecuteFunction;
 };
@@ -290,6 +293,26 @@ describe('Test PostgresV2, executeQuery operation', () => {
 			nodeOptions,
 		);
 	});
+
+	it('should call runQueries with falsy query replacements', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)',
+			options: {
+				queryReplacement: '={{ 0 }}, {{ null }}, {{ 0 }}',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		expect(async () => {
+			await executeQuery.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				items,
+				nodeOptions,
+			);
+		}).not.toThrow();
+	});
 });
 
 describe('Test PostgresV2, insert operation', () => {
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 4e6100e575..d103abd399 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
@@ -80,7 +80,7 @@ export async function execute(
 			const rawReplacements = (node.parameters.options as IDataObject)?.queryReplacement as string;
 
 			const stringToArray = (str: NodeParameterValueType | undefined) => {
-				if (!str) return [];
+				if (str === undefined) return [];
 				return String(str)
 					.split(',')
 					.filter((entry) => entry)
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
index 5abe6f913a..c5e491159b 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
@@ -16,6 +16,7 @@ export const versionDescription: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	usableAsTool: true,
 	credentials: [
 		{
 			name: 'postgres',
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
index 73b50bbc64..3dca37bd62 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
+++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.filesreadwrite/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readwritefile/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
index b9c9911ab2..8eda9032a0 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.filesreadwrite/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readwritefile/"
 			}
 		]
 	},
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index f547804b4f..59d1582fdb 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -29,6 +29,7 @@ export class Redis implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'redis',
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index 68bd19e3f1..0ad0dd85c3 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -8,7 +8,16 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { jsonParse, BINARY_ENCODING, NodeOperationError, NodeConnectionType } from 'n8n-workflow';
+import {
+	jsonParse,
+	BINARY_ENCODING,
+	NodeOperationError,
+	NodeConnectionType,
+	WEBHOOK_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
+	CHAT_TRIGGER_NODE_TYPE,
+	WAIT_NODE_TYPE,
+} from 'n8n-workflow';
 import set from 'lodash/set';
 import jwt from 'jsonwebtoken';
 import { formatPrivateKey, generatePairedItemData } from '../../utils/utilities';
@@ -291,9 +300,10 @@ export class RespondToWebhook implements INodeType {
 		const nodeVersion = this.getNode().typeVersion;
 
 		const WEBHOOK_NODE_TYPES = [
-			'n8n-nodes-base.webhook',
-			'n8n-nodes-base.formTrigger',
-			'@n8n/n8n-nodes-langchain.chatTrigger',
+			WEBHOOK_NODE_TYPE,
+			FORM_TRIGGER_NODE_TYPE,
+			CHAT_TRIGGER_NODE_TYPE,
+			WAIT_NODE_TYPE,
 		];
 
 		try {
diff --git a/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts b/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
new file mode 100644
index 0000000000..c090511552
--- /dev/null
+++ b/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
@@ -0,0 +1,47 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import {
+	WAIT_NODE_TYPE,
+	type IExecuteFunctions,
+	type INode,
+	type NodeTypeAndVersion,
+} from 'n8n-workflow';
+
+import { RespondToWebhook } from '../RespondToWebhook.node';
+
+describe('RespondToWebhook Node', () => {
+	let respondToWebhook: RespondToWebhook;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		respondToWebhook = new RespondToWebhook();
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+	});
+
+	describe('execute method', () => {
+		it('should throw an error if no WEBHOOK_NODE_TYPES in parents', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: 'n8n-nodes-base.someNode' }),
+			]);
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).rejects.toThrow(
+				'No Webhook node found in the workflow',
+			);
+		});
+		it('should not throw an error if WEBHOOK_NODE_TYPES is in parents', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValue('text');
+			mockExecuteFunctions.getNodeParameter.mockReturnValue({});
+			mockExecuteFunctions.getNodeParameter.mockReturnValue('noData');
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
index a0607f3b86..523860ddd1 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
@@ -78,14 +78,15 @@ export class RssFeedReadTrigger implements INodeType {
 				return [this.helpers.returnJsonArray(feed.items[0])];
 			}
 			feed.items.forEach((item) => {
-				if (Date.parse(item.isoDate as string) > dateToCheck) {
+				if (item.isoDate && Date.parse(item.isoDate) > dateToCheck) {
 					returnData.push(item);
 				}
 			});
 
 			if (feed.items.length) {
-				const maxIsoDate = Math.max(...feed.items.map(({ isoDate }) => Date.parse(isoDate!)));
-				pollData.lastItemDate = new Date(maxIsoDate).toISOString();
+				pollData.lastItemDate = feed.items.reduce((a, b) =>
+					new Date(a.isoDate!) > new Date(b.isoDate!) ? a : b,
+				).isoDate;
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
index 0f7b13fbe9..d942859764 100644
--- a/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
@@ -46,6 +46,20 @@ describe('RssFeedReadTrigger', () => {
 			expect(pollData.lastItemDate).toEqual(newItemDate);
 		});
 
+		it('should gracefully handle missing timestamps', async () => {
+			const pollData = mock();
+			pollFunctions.getNodeParameter.mockReturnValue(feedUrl);
+			pollFunctions.getWorkflowStaticData.mockReturnValue(pollData);
+			(Parser.prototype.parseURL as jest.Mock).mockResolvedValue({ items: [{}, {}] });
+
+			const result = await node.poll.call(pollFunctions);
+
+			expect(result).toEqual(null);
+			expect(pollFunctions.getWorkflowStaticData).toHaveBeenCalledWith('node');
+			expect(pollFunctions.getNodeParameter).toHaveBeenCalledWith('feedUrl');
+			expect(Parser.prototype.parseURL).toHaveBeenCalledWith(feedUrl);
+		});
+
 		it('should return null if the feed is empty', async () => {
 			const pollData = mock({ lastItemDate });
 			pollFunctions.getNodeParameter.mockReturnValue(feedUrl);
diff --git a/packages/nodes-base/nodes/Schedule/test/ScheduleTrigger.node.test.ts b/packages/nodes-base/nodes/Schedule/test/ScheduleTrigger.node.test.ts
new file mode 100644
index 0000000000..aa81a05857
--- /dev/null
+++ b/packages/nodes-base/nodes/Schedule/test/ScheduleTrigger.node.test.ts
@@ -0,0 +1,158 @@
+import * as n8nWorkflow from 'n8n-workflow';
+
+import { testTriggerNode } from '@test/nodes/TriggerHelpers';
+
+import { ScheduleTrigger } from '../ScheduleTrigger.node';
+
+describe('ScheduleTrigger', () => {
+	Object.defineProperty(n8nWorkflow, 'randomInt', {
+		value: (min: number, max: number) => Math.floor((min + max) / 2),
+	});
+
+	const HOUR = 60 * 60 * 1000;
+	const mockDate = new Date('2023-12-28 12:34:56.789Z');
+	const timezone = 'Europe/Berlin';
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		jest.useFakeTimers();
+		jest.setSystemTime(mockDate);
+	});
+
+	describe('trigger', () => {
+		it('should emit on defined schedule', async () => {
+			const { emit } = await testTriggerNode(ScheduleTrigger, {
+				timezone,
+				node: { parameters: { rule: { interval: [{ field: 'hours', hoursInterval: 3 }] } } },
+				workflowStaticData: { recurrenceRules: [] },
+			});
+
+			expect(emit).not.toHaveBeenCalled();
+
+			jest.advanceTimersByTime(HOUR);
+			expect(emit).not.toHaveBeenCalled();
+
+			jest.advanceTimersByTime(2 * HOUR);
+			expect(emit).toHaveBeenCalledTimes(1);
+
+			const firstTriggerData = emit.mock.calls[0][0][0][0];
+			expect(firstTriggerData.json).toEqual({
+				'Day of month': '28',
+				'Day of week': 'Thursday',
+				Hour: '15',
+				Minute: '30',
+				Month: 'December',
+				'Readable date': 'December 28th 2023, 3:30:30 pm',
+				'Readable time': '3:30:30 pm',
+				Second: '30',
+				Timezone: 'Europe/Berlin (UTC+01:00)',
+				Year: '2023',
+				timestamp: '2023-12-28T15:30:30.000+01:00',
+			});
+
+			jest.setSystemTime(new Date(firstTriggerData.json.timestamp as string));
+
+			jest.advanceTimersByTime(2 * HOUR);
+			expect(emit).toHaveBeenCalledTimes(1);
+
+			jest.advanceTimersByTime(HOUR);
+			expect(emit).toHaveBeenCalledTimes(2);
+		});
+
+		it('should emit on schedule defined as a cron expression', async () => {
+			const { emit } = await testTriggerNode(ScheduleTrigger, {
+				timezone,
+				node: {
+					parameters: {
+						rule: {
+							interval: [
+								{
+									field: 'cronExpression',
+									expression: '0 */2 * * *', // every 2 hours
+								},
+							],
+						},
+					},
+				},
+				workflowStaticData: {},
+			});
+
+			expect(emit).not.toHaveBeenCalled();
+
+			jest.advanceTimersByTime(2 * HOUR);
+			expect(emit).toHaveBeenCalledTimes(1);
+
+			jest.advanceTimersByTime(2 * HOUR);
+			expect(emit).toHaveBeenCalledTimes(2);
+		});
+
+		it('should throw on invalid cron expressions', async () => {
+			await expect(
+				testTriggerNode(ScheduleTrigger, {
+					timezone,
+					node: {
+						parameters: {
+							rule: {
+								interval: [
+									{
+										field: 'cronExpression',
+										expression: '100 * * * *', // minute should be 0-59 -> invalid
+									},
+								],
+							},
+						},
+					},
+					workflowStaticData: {},
+				}),
+			).rejects.toBeInstanceOf(n8nWorkflow.NodeOperationError);
+		});
+
+		it('should emit when manually executed', async () => {
+			const { emit } = await testTriggerNode(ScheduleTrigger, {
+				mode: 'manual',
+				timezone,
+				node: { parameters: { rule: { interval: [{ field: 'hours', hoursInterval: 3 }] } } },
+				workflowStaticData: { recurrenceRules: [] },
+			});
+
+			expect(emit).toHaveBeenCalledTimes(1);
+
+			const firstTriggerData = emit.mock.calls[0][0][0][0];
+			expect(firstTriggerData.json).toEqual({
+				'Day of month': '28',
+				'Day of week': 'Thursday',
+				Hour: '13',
+				Minute: '34',
+				Month: 'December',
+				'Readable date': 'December 28th 2023, 1:34:56 pm',
+				'Readable time': '1:34:56 pm',
+				Second: '56',
+				Timezone: 'Europe/Berlin (UTC+01:00)',
+				Year: '2023',
+				timestamp: '2023-12-28T13:34:56.789+01:00',
+			});
+		});
+
+		it('should throw on invalid cron expressions in manual mode', async () => {
+			await expect(
+				testTriggerNode(ScheduleTrigger, {
+					mode: 'manual',
+					timezone,
+					node: {
+						parameters: {
+							rule: {
+								interval: [
+									{
+										field: 'cronExpression',
+										expression: '@daily *', // adding extra fields to shorthand not allowed -> invalid
+									},
+								],
+							},
+						},
+					},
+					workflowStaticData: {},
+				}),
+			).rejects.toBeInstanceOf(n8nWorkflow.NodeOperationError);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Schedule/tests/ScheduleTrigger.node.test.ts b/packages/nodes-base/nodes/Schedule/tests/ScheduleTrigger.node.test.ts
deleted file mode 100644
index 0693806f4c..0000000000
--- a/packages/nodes-base/nodes/Schedule/tests/ScheduleTrigger.node.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import * as n8nWorkflow from 'n8n-workflow';
-import type { INode, ITriggerFunctions, Workflow } from 'n8n-workflow';
-import { type InstanceSettings, returnJsonArray } from 'n8n-core';
-import { ScheduledTaskManager } from 'n8n-core/dist/ScheduledTaskManager';
-import { mock } from 'jest-mock-extended';
-import { ScheduleTrigger } from '../ScheduleTrigger.node';
-
-describe('ScheduleTrigger', () => {
-	Object.defineProperty(n8nWorkflow, 'randomInt', {
-		value: (min: number, max: number) => Math.floor((min + max) / 2),
-	});
-
-	const HOUR = 60 * 60 * 1000;
-	const mockDate = new Date('2023-12-28 12:34:56.789Z');
-	const timezone = 'Europe/Berlin';
-	jest.useFakeTimers();
-	jest.setSystemTime(mockDate);
-
-	const node = mock<INode>({ typeVersion: 1 });
-	const workflow = mock<Workflow>({ timezone });
-	const instanceSettings = mock<InstanceSettings>({ isLeader: true });
-	const scheduledTaskManager = new ScheduledTaskManager(instanceSettings);
-	const helpers = mock<ITriggerFunctions['helpers']>({
-		returnJsonArray,
-		registerCron: (cronExpression, onTick) =>
-			scheduledTaskManager.registerCron(workflow, cronExpression, onTick),
-	});
-
-	const triggerFunctions = mock<ITriggerFunctions>({
-		helpers,
-		getTimezone: () => timezone,
-		getNode: () => node,
-		getMode: () => 'trigger',
-	});
-
-	const scheduleTrigger = new ScheduleTrigger();
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-	});
-
-	describe('trigger', () => {
-		it('should emit on defined schedule', async () => {
-			triggerFunctions.getNodeParameter.calledWith('rule', expect.anything()).mockReturnValueOnce({
-				interval: [{ field: 'hours', hoursInterval: 3 }],
-			});
-			triggerFunctions.getWorkflowStaticData.mockReturnValueOnce({ recurrenceRules: [] });
-
-			const result = await scheduleTrigger.trigger.call(triggerFunctions);
-			// Assert that no manualTriggerFunction is returned
-			expect(result).toEqual({});
-
-			expect(triggerFunctions.emit).not.toHaveBeenCalled();
-
-			jest.advanceTimersByTime(HOUR);
-			expect(triggerFunctions.emit).not.toHaveBeenCalled();
-
-			jest.advanceTimersByTime(2 * HOUR);
-			expect(triggerFunctions.emit).toHaveBeenCalledTimes(1);
-
-			const firstTriggerData = triggerFunctions.emit.mock.calls[0][0][0][0];
-			expect(firstTriggerData.json).toEqual({
-				'Day of month': '28',
-				'Day of week': 'Thursday',
-				Hour: '15',
-				Minute: '30',
-				Month: 'December',
-				'Readable date': 'December 28th 2023, 3:30:30 pm',
-				'Readable time': '3:30:30 pm',
-				Second: '30',
-				Timezone: 'Europe/Berlin (UTC+01:00)',
-				Year: '2023',
-				timestamp: '2023-12-28T15:30:30.000+01:00',
-			});
-
-			jest.setSystemTime(new Date(firstTriggerData.json.timestamp as string));
-
-			jest.advanceTimersByTime(2 * HOUR);
-			expect(triggerFunctions.emit).toHaveBeenCalledTimes(1);
-			jest.advanceTimersByTime(HOUR);
-			expect(triggerFunctions.emit).toHaveBeenCalledTimes(2);
-		});
-	});
-});
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index 5c00c3eb3f..590453308c 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -11,6 +11,7 @@ import type {
 import { NodeOperationError } from 'n8n-workflow';
 
 import get from 'lodash/get';
+import { getSendAndWaitConfig } from '../../../utils/sendAndWait/utils';
 
 export async function slackApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
@@ -78,6 +79,16 @@ export async function slackApiRequest(
 					level: 'warning',
 				},
 			);
+		} else if (response.error === 'not_admin') {
+			throw new NodeOperationError(
+				this.getNode(),
+				'Need higher Role Level for this Operation (e.g. Owner or Admin Rights)',
+				{
+					description:
+						'Hint: Check the Role of your Slack App Integration. For more information see the Slack Documentation - https://slack.com/help/articles/360018112273-Types-of-roles-in-Slack',
+					level: 'warning',
+				},
+			);
 		}
 
 		throw new NodeOperationError(
@@ -85,6 +96,7 @@ export async function slackApiRequest(
 			'Slack error response: ' + JSON.stringify(response.error),
 		);
 	}
+
 	if (response.ts !== undefined) {
 		Object.assign(response, { message_timestamp: response.ts });
 		delete response.ts;
@@ -219,3 +231,81 @@ export function validateJSON(json: string | undefined): any {
 	}
 	return result;
 }
+
+export function getTarget(
+	context: IExecuteFunctions,
+	itemIndex: number,
+	idType: 'user' | 'channel',
+): string {
+	let target = '';
+
+	if (idType === 'channel') {
+		target = context.getNodeParameter('channelId', itemIndex, undefined, {
+			extractValue: true,
+		}) as string;
+	} else {
+		target = context.getNodeParameter('user', itemIndex, undefined, {
+			extractValue: true,
+		}) as string;
+	}
+
+	if (
+		idType === 'user' &&
+		(context.getNodeParameter('user', itemIndex) as IDataObject).mode === 'username'
+	) {
+		target = target.slice(0, 1) === '@' ? target : `@${target}`;
+	}
+
+	return target;
+}
+
+export function createSendAndWaitMessageBody(context: IExecuteFunctions) {
+	const select = context.getNodeParameter('select', 0) as 'user' | 'channel';
+	const target = getTarget(context, 0, select);
+
+	const config = getSendAndWaitConfig(context);
+
+	const body: IDataObject = {
+		channel: target,
+		blocks: [
+			{
+				type: 'divider',
+			},
+			{
+				type: 'section',
+				text: {
+					type: 'plain_text',
+					text: config.message,
+					emoji: true,
+				},
+			},
+			{
+				type: 'section',
+				text: {
+					type: 'plain_text',
+					text: ' ',
+				},
+			},
+			{
+				type: 'divider',
+			},
+			{
+				type: 'actions',
+				elements: config.options.map((option) => {
+					return {
+						type: 'button',
+						style: option.style === 'primary' ? 'primary' : undefined,
+						text: {
+							type: 'plain_text',
+							text: option.label,
+							emoji: true,
+						},
+						url: `${config.url}?approved=${option.value}`,
+					};
+				}),
+			},
+		],
+	};
+
+	return body;
+}
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
index 3100b258f5..de31614b44 100644
--- a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
@@ -1,4 +1,4 @@
-import type { INodeProperties } from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
 
 export const messageOperations: INodeProperties[] = [
 	{
@@ -32,6 +32,11 @@ export const messageOperations: INodeProperties[] = [
 				value: 'post',
 				action: 'Send a message',
 			},
+			{
+				name: 'Send and Wait for Approval',
+				value: SEND_AND_WAIT_OPERATION,
+				action: 'Send a message and wait for approval',
+			},
 			{
 				name: 'Update',
 				value: 'update',
@@ -42,6 +47,134 @@ export const messageOperations: INodeProperties[] = [
 	},
 ];
 
+export const sendToSelector: INodeProperties = {
+	displayName: 'Send Message To',
+	name: 'select',
+	type: 'options',
+	required: true,
+	displayOptions: {
+		show: {
+			resource: ['message'],
+			operation: ['post'],
+		},
+	},
+	options: [
+		{
+			name: 'Channel',
+			value: 'channel',
+		},
+		{
+			name: 'User',
+			value: 'user',
+		},
+	],
+	default: '',
+	placeholder: 'Select...',
+};
+
+export const channelRLC: INodeProperties = {
+	displayName: 'Channel',
+	name: 'channelId',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	placeholder: 'Select a channel...',
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a channel...',
+			typeOptions: {
+				searchListMethod: 'getChannels',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Slack Channel ID',
+					},
+				},
+			],
+			placeholder: 'C0122KQ70S7E',
+		},
+		{
+			displayName: 'By Name',
+			name: 'name',
+			type: 'string',
+			placeholder: '#general',
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+						errorMessage: 'Not a valid Slack Channel URL',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+			},
+		},
+	],
+	required: true,
+	description: 'The Slack channel to send to',
+};
+
+export const userRLC: INodeProperties = {
+	displayName: 'User',
+	name: 'user',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	placeholder: 'Select a user...',
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			placeholder: 'Select a user...',
+			typeOptions: {
+				searchListMethod: 'getUsers',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Slack User ID',
+					},
+				},
+			],
+			placeholder: 'U123AB45JGM',
+		},
+		{
+			displayName: 'By username',
+			name: 'username',
+			type: 'string',
+			placeholder: '@username',
+		},
+	],
+};
+
 export const messageFields: INodeProperties[] = [
 	/* ----------------------------------------------------------------------- */
 	/*                                 message:getPermalink
@@ -125,88 +258,9 @@ export const messageFields: INodeProperties[] = [
 	/* -------------------------------------------------------------------------- */
 	/*                          message:post                                      */
 	/* -------------------------------------------------------------------------- */
+	sendToSelector,
 	{
-		displayName: 'Send Message To',
-		name: 'select',
-		type: 'options',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: ['message'],
-				operation: ['post'],
-			},
-		},
-		options: [
-			{
-				name: 'Channel',
-				value: 'channel',
-			},
-			{
-				name: 'User',
-				value: 'user',
-			},
-		],
-		default: '',
-		placeholder: 'Select...',
-	},
-	{
-		displayName: 'Channel',
-		name: 'channelId',
-		type: 'resourceLocator',
-		default: { mode: 'list', value: '' },
-		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By Name',
-				name: 'name',
-				type: 'string',
-				placeholder: '#general',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		...channelRLC,
 		displayOptions: {
 			show: {
 				operation: ['post'],
@@ -214,15 +268,9 @@ export const messageFields: INodeProperties[] = [
 				select: ['channel'],
 			},
 		},
-		required: true,
-		description: 'The Slack channel to send to',
 	},
 	{
-		displayName: 'User',
-		name: 'user',
-		type: 'resourceLocator',
-		default: { mode: 'list', value: '' },
-		placeholder: 'Select a user...',
+		...userRLC,
 		displayOptions: {
 			show: {
 				operation: ['post'],
@@ -230,39 +278,6 @@ export const messageFields: INodeProperties[] = [
 				select: ['user'],
 			},
 		},
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a user...',
-				typeOptions: {
-					searchListMethod: 'getUsers',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack User ID',
-						},
-					},
-				],
-				placeholder: 'U123AB45JGM',
-			},
-			{
-				displayName: 'By username',
-				name: 'username',
-				type: 'string',
-				placeholder: '@username',
-			},
-		],
 	},
 	{
 		displayName: 'Message Type',
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 14d62c6971..3ba8cca7b8 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -15,17 +15,36 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 
-import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import {
+	BINARY_ENCODING,
+	NodeConnectionType,
+	NodeOperationError,
+	SEND_AND_WAIT_OPERATION,
+	WAIT_TIME_UNLIMITED,
+} from 'n8n-workflow';
 
 import moment from 'moment-timezone';
 import { channelFields, channelOperations } from './ChannelDescription';
-import { messageFields, messageOperations } from './MessageDescription';
+import {
+	channelRLC,
+	messageFields,
+	messageOperations,
+	sendToSelector,
+	userRLC,
+} from './MessageDescription';
 import { starFields, starOperations } from './StarDescription';
 import { fileFields, fileOperations } from './FileDescription';
 import { reactionFields, reactionOperations } from './ReactionDescription';
 import { userGroupFields, userGroupOperations } from './UserGroupDescription';
 import { userFields, userOperations } from './UserDescription';
-import { slackApiRequest, slackApiRequestAllItems, getMessageContent } from './GenericFunctions';
+import {
+	slackApiRequest,
+	slackApiRequestAllItems,
+	getMessageContent,
+	getTarget,
+	createSendAndWaitMessageBody,
+} from './GenericFunctions';
+import { getSendAndWaitProperties, sendAndWaitWebhook } from '../../../utils/sendAndWait/utils';
 
 export class SlackV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -39,6 +58,7 @@ export class SlackV2 implements INodeType {
 			},
 			inputs: [NodeConnectionType.Main],
 			outputs: [NodeConnectionType.Main],
+			usableAsTool: true,
 			credentials: [
 				{
 					name: 'slackApi',
@@ -59,6 +79,17 @@ export class SlackV2 implements INodeType {
 					},
 				},
 			],
+			webhooks: [
+				{
+					name: 'default',
+					httpMethod: 'GET',
+					responseMode: 'onReceived',
+					responseData: '',
+					path: '={{ $nodeId }}',
+					restartWebhook: true,
+					isFullPath: true,
+				},
+			],
 			properties: [
 				{
 					displayName: 'Authentication',
@@ -119,6 +150,25 @@ export class SlackV2 implements INodeType {
 				...channelFields,
 				...messageOperations,
 				...messageFields,
+				...getSendAndWaitProperties([
+					{ ...sendToSelector, default: 'user' },
+					{
+						...channelRLC,
+						displayOptions: {
+							show: {
+								select: ['channel'],
+							},
+						},
+					},
+					{
+						...userRLC,
+						displayOptions: {
+							show: {
+								select: ['user'],
+							},
+						},
+					},
+				]).filter((p) => p.name !== 'subject'),
 				...starOperations,
 				...starFields,
 				...fileOperations,
@@ -306,6 +356,8 @@ export class SlackV2 implements INodeType {
 		},
 	};
 
+	webhook = sendAndWaitWebhook;
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: INodeExecutionData[] = [];
@@ -319,6 +371,18 @@ export class SlackV2 implements INodeType {
 		const nodeVersion = this.getNode().typeVersion;
 		const instanceId = this.getInstanceId();
 
+		if (resource === 'message' && operation === SEND_AND_WAIT_OPERATION) {
+			await slackApiRequest.call(
+				this,
+				'POST',
+				'/chat.postMessage',
+				createSendAndWaitMessageBody(this),
+			);
+
+			await this.putExecutionToWait(new Date(WAIT_TIME_UNLIMITED));
+			return [this.getInputData()];
+		}
+
 		for (let i = 0; i < length; i++) {
 			try {
 				responseData = {
@@ -748,22 +812,8 @@ export class SlackV2 implements INodeType {
 				if (resource === 'message') {
 					//https://api.slack.com/methods/chat.postMessage
 					if (operation === 'post') {
-						const select = this.getNodeParameter('select', i) as string;
-						let target =
-							select === 'channel'
-								? (this.getNodeParameter('channelId', i, undefined, {
-										extractValue: true,
-									}) as string)
-								: (this.getNodeParameter('user', i, undefined, {
-										extractValue: true,
-									}) as string);
-
-						if (
-							select === 'user' &&
-							(this.getNodeParameter('user', i) as IDataObject).mode === 'username'
-						) {
-							target = target.slice(0, 1) === '@' ? target : `@${target}`;
-						}
+						const select = this.getNodeParameter('select', i) as 'user' | 'channel';
+						const target = getTarget(this, i, select);
 						const { sendAsUser } = this.getNodeParameter('otherOptions', i) as IDataObject;
 						const content = getMessageContent.call(this, i, nodeVersion, instanceId);
 
@@ -1249,18 +1299,29 @@ export class SlackV2 implements INodeType {
 
 							options.fields = fields;
 						}
+
 						Object.assign(body, options);
+						let requestBody: IDataObject = { profile: body };
+
+						let userId;
+						if (options.user) {
+							userId = options.user;
+							delete body.user;
+							requestBody = { profile: body, user: userId };
+						}
+
 						responseData = await slackApiRequest.call(
 							this,
 							'POST',
 							'/users.profile.set',
-							{ profile: body },
+							requestBody,
 							qs,
 						);
 
 						responseData = responseData.profile;
 					}
 				}
+
 				if (resource === 'userGroup') {
 					//https://api.slack.com/methods/usergroups.create
 					if (operation === 'create') {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/utils.test.ts b/packages/nodes-base/nodes/Slack/test/v2/utils.test.ts
new file mode 100644
index 0000000000..634ee25900
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/utils.test.ts
@@ -0,0 +1,146 @@
+import { type MockProxy, mock } from 'jest-mock-extended';
+import type { IExecuteFunctions } from 'n8n-workflow';
+import { getTarget, createSendAndWaitMessageBody } from '../../V2/GenericFunctions';
+
+describe('Slack Utility Functions', () => {
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+		mockExecuteFunctions.getNode.mockReturnValue({ name: 'Slack', typeVersion: 1 } as any);
+		jest.clearAllMocks();
+	});
+
+	describe('getTarget', () => {
+		it('should return corect target id', () => {
+			mockExecuteFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				if (parameterName === 'user') {
+					return 'testUser';
+				}
+				return 'testChannel';
+			});
+			expect(getTarget(mockExecuteFunctions, 0, 'channel')).toEqual('testChannel');
+
+			expect(getTarget(mockExecuteFunctions, 0, 'user')).toEqual('testUser');
+		});
+	});
+
+	describe('createSendAndWaitMessageBody', () => {
+		it('should create message with single button', () => {
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('channel');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('channelID');
+
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('message');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('subject');
+			mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('localhost');
+			mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('node123');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({});
+
+			expect(createSendAndWaitMessageBody(mockExecuteFunctions)).toEqual({
+				blocks: [
+					{
+						type: 'divider',
+					},
+					{
+						text: {
+							emoji: true,
+							text: 'message',
+							type: 'plain_text',
+						},
+						type: 'section',
+					},
+					{
+						text: {
+							text: ' ',
+							type: 'plain_text',
+						},
+						type: 'section',
+					},
+					{
+						type: 'divider',
+					},
+					{
+						elements: [
+							{
+								style: 'primary',
+								text: {
+									emoji: true,
+									text: 'Approve',
+									type: 'plain_text',
+								},
+								type: 'button',
+								url: 'localhost/node123?approved=true',
+							},
+						],
+						type: 'actions',
+					},
+				],
+				channel: 'channelID',
+			});
+		});
+
+		it('should create message with double buttona', () => {
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('channel');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('channelID');
+
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('message');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('subject');
+			mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('localhost');
+			mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('node123');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({ approvalType: 'double' });
+
+			expect(createSendAndWaitMessageBody(mockExecuteFunctions)).toEqual({
+				blocks: [
+					{
+						type: 'divider',
+					},
+					{
+						text: {
+							emoji: true,
+							text: 'message',
+							type: 'plain_text',
+						},
+						type: 'section',
+					},
+					{
+						text: {
+							text: ' ',
+							type: 'plain_text',
+						},
+						type: 'section',
+					},
+					{
+						type: 'divider',
+					},
+					{
+						elements: [
+							{
+								style: undefined,
+								text: {
+									emoji: true,
+									text: 'Disapprove',
+									type: 'plain_text',
+								},
+								type: 'button',
+								url: 'localhost/node123?approved=false',
+							},
+
+							{
+								style: 'primary',
+								text: {
+									emoji: true,
+									text: 'Approve',
+									type: 'plain_text',
+								},
+								type: 'button',
+								url: 'localhost/node123?approved=true',
+							},
+						],
+						type: 'actions',
+					},
+				],
+				channel: 'channelID',
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
index d6151b2dca..929da0ad30 100644
--- a/packages/nodes-base/nodes/Supabase/Supabase.node.ts
+++ b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
@@ -43,6 +43,7 @@ export class Supabase implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'supabaseApi',
@@ -186,8 +187,8 @@ export class Supabase implements INodeType {
 			if (operation === 'delete') {
 				const tableId = this.getNodeParameter('tableId', 0) as string;
 				const filterType = this.getNodeParameter('filterType', 0) as string;
-				let endpoint = `/${tableId}`;
 				for (let i = 0; i < length; i++) {
+					let endpoint = `/${tableId}`;
 					if (filterType === 'manual') {
 						const matchType = this.getNodeParameter('matchType', 0) as string;
 						const keys = this.getNodeParameter('filters.conditions', i, []) as IDataObject[];
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 6ecc26ed79..5ae67465bf 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -10,8 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { addAdditionalFields, apiRequest, getPropertyName } from './GenericFunctions';
 import { appendAttributionOption } from '../../utils/descriptions';
+import { addAdditionalFields, apiRequest, getPropertyName } from './GenericFunctions';
 
 export class Telegram implements INodeType {
 	description: INodeTypeDescription = {
@@ -25,6 +25,7 @@ export class Telegram implements INodeType {
 		defaults: {
 			name: 'Telegram',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Todoist/v2/Service.ts b/packages/nodes-base/nodes/Todoist/v2/Service.ts
index fa5112a5bf..b9fdb75ec3 100644
--- a/packages/nodes-base/nodes/Todoist/v2/Service.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/Service.ts
@@ -54,6 +54,11 @@ export interface Service {
 	execute(ctx: Context, operation: OperationType, itemIndex: number): Promise<TodoistResponse>;
 }
 
+export interface TodoistProjectType {
+	id: number;
+	name: string;
+}
+
 export interface TodoistResponse {
 	success?: boolean;
 	data?: IDataObject;
diff --git a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
index bcae9206e7..585b205e0b 100644
--- a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
@@ -13,7 +13,7 @@ import {
 
 import { todoistApiRequest } from '../GenericFunctions';
 
-import type { OperationType } from './Service';
+import type { OperationType, TodoistProjectType } from './Service';
 import { TodoistService } from './Service';
 
 // interface IBodyCreateTask {
@@ -610,22 +610,24 @@ export class TodoistV2 implements INodeType {
 
 	methods = {
 		listSearch: {
-			async searchProjects(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
-				const projects = await todoistApiRequest.call(this, 'GET', '/projects');
+			async searchProjects(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+			): Promise<INodeListSearchResult> {
+				const projects: TodoistProjectType[] = await todoistApiRequest.call(
+					this,
+					'GET',
+					'/projects',
+				);
 				return {
-					results: projects.map((project: IDataObject) => ({
-						name: project.name,
-						value: project.id,
-					})),
-				};
-			},
-			async searchLabels(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
-				const labels = await todoistApiRequest.call(this, 'GET', '/labels');
-				return {
-					results: labels.map((label: IDataObject) => ({
-						name: label.name,
-						value: label.name,
-					})),
+					results: projects
+						.filter(
+							(project) => !filter || project.name.toLowerCase().includes(filter.toLowerCase()),
+						)
+						.map((project) => ({
+							name: project.name,
+							value: project.id,
+						})),
 				};
 			},
 		},
@@ -636,12 +638,9 @@ export class TodoistV2 implements INodeType {
 				const returnData: INodePropertyOptions[] = [];
 				const projects = await todoistApiRequest.call(this, 'GET', '/projects');
 				for (const project of projects) {
-					const projectName = project.name;
-					const projectId = project.id;
-
 					returnData.push({
-						name: projectName,
-						value: projectId,
+						name: project.name,
+						value: project.id,
 					});
 				}
 
@@ -666,12 +665,9 @@ export class TodoistV2 implements INodeType {
 					const qs: IDataObject = { project_id: projectId };
 					const sections = await todoistApiRequest.call(this, 'GET', '/sections', {}, qs);
 					for (const section of sections) {
-						const sectionName = section.name;
-						const sectionId = section.id;
-
 						returnData.push({
-							name: sectionName,
-							value: sectionId,
+							name: section.name,
+							value: section.id,
 						});
 					}
 				}
@@ -706,12 +702,9 @@ export class TodoistV2 implements INodeType {
 
 					const items = await todoistApiRequest.call(this, 'GET', '/tasks', {}, qs);
 					for (const item of items) {
-						const itemContent = item.content;
-						const itemId = item.id;
-
 						returnData.push({
-							name: itemContent,
-							value: itemId,
+							name: item.content,
+							value: item.id,
 						});
 					}
 				}
@@ -726,10 +719,9 @@ export class TodoistV2 implements INodeType {
 				const labels = await todoistApiRequest.call(this, 'GET', '/labels');
 
 				for (const label of labels) {
-					const labelName = label.name;
 					returnData.push({
-						name: labelName,
-						value: labelName,
+						name: label.name,
+						value: label.name,
 					});
 				}
 
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.ts
index 9a814f04fc..2af7fd7f2e 100644
--- a/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.ts
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/RemoveDuplicates.node.ts
@@ -1,234 +1,25 @@
-import get from 'lodash/get';
-import isEqual from 'lodash/isEqual';
-import lt from 'lodash/lt';
-import pick from 'lodash/pick';
-import {
-	NodeOperationError,
-	NodeConnectionType,
-	type IExecuteFunctions,
-	type INodeExecutionData,
-	type INodeType,
-	type INodeTypeDescription,
-} from 'n8n-workflow';
-import { prepareFieldsArray } from '../utils/utils';
-import { validateInputData } from './utils';
-import { compareItems, flattenKeys } from '@utils/utilities';
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
 
-export class RemoveDuplicates implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Remove Duplicates',
-		name: 'removeDuplicates',
-		icon: 'file:removeDuplicates.svg',
-		group: ['transform'],
-		subtitle: '',
-		version: [1, 1.1],
-		description: 'Delete items with matching field values',
-		defaults: {
-			name: 'Remove Duplicates',
-		},
-		inputs: [NodeConnectionType.Main],
-		outputs: [NodeConnectionType.Main],
-		properties: [
-			{
-				displayName: 'Compare',
-				name: 'compare',
-				type: 'options',
-				options: [
-					{
-						name: 'All Fields',
-						value: 'allFields',
-					},
-					{
-						name: 'All Fields Except',
-						value: 'allFieldsExcept',
-					},
-					{
-						name: 'Selected Fields',
-						value: 'selectedFields',
-					},
-				],
-				default: 'allFields',
-				description: 'The fields of the input items to compare to see if they are the same',
-			},
-			{
-				displayName: 'Fields To Exclude',
-				name: 'fieldsToExclude',
-				type: 'string',
-				placeholder: 'e.g. email, name',
-				requiresDataPath: 'multiple',
-				description: 'Fields in the input to exclude from the comparison',
-				default: '',
-				displayOptions: {
-					show: {
-						compare: ['allFieldsExcept'],
-					},
-				},
-			},
-			{
-				displayName: 'Fields To Compare',
-				name: 'fieldsToCompare',
-				type: 'string',
-				placeholder: 'e.g. email, name',
-				requiresDataPath: 'multiple',
-				description: 'Fields in the input to add to the comparison',
-				default: '',
-				displayOptions: {
-					show: {
-						compare: ['selectedFields'],
-					},
-				},
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Field',
-				default: {},
-				displayOptions: {
-					show: {
-						compare: ['allFieldsExcept', 'selectedFields'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Disable Dot Notation',
-						name: 'disableDotNotation',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to disallow referencing child fields using `parent.child` in the field name',
-					},
-					{
-						displayName: 'Remove Other Fields',
-						name: 'removeOtherFields',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to remove any fields that are not being compared. If disabled, will keep the values from the first of the duplicates.',
-					},
-				],
-			},
-		],
-	};
+import { RemoveDuplicatesV1 } from './v1/RemoveDuplicatesV1.node';
+import { RemoveDuplicatesV2 } from './v2/RemoveDuplicatesV2.node';
+export class RemoveDuplicates extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Remove Duplicates',
+			name: 'removeDuplicates',
+			icon: 'file:removeDuplicates.svg',
+			group: ['transform'],
+			defaultVersion: 2,
+			description: 'Delete items with matching field values',
+		};
 
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const compare = this.getNodeParameter('compare', 0) as string;
-		const disableDotNotation = this.getNodeParameter(
-			'options.disableDotNotation',
-			0,
-			false,
-		) as boolean;
-		const removeOtherFields = this.getNodeParameter(
-			'options.removeOtherFields',
-			0,
-			false,
-		) as boolean;
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new RemoveDuplicatesV1(baseDescription),
+			1.1: new RemoveDuplicatesV1(baseDescription),
+			2: new RemoveDuplicatesV2(baseDescription),
+		};
 
-		let keys = disableDotNotation
-			? Object.keys(items[0].json)
-			: Object.keys(flattenKeys(items[0].json));
-
-		for (const item of items) {
-			for (const key of disableDotNotation
-				? Object.keys(item.json)
-				: Object.keys(flattenKeys(item.json))) {
-				if (!keys.includes(key)) {
-					keys.push(key);
-				}
-			}
-		}
-
-		if (compare === 'allFieldsExcept') {
-			const fieldsToExclude = prepareFieldsArray(
-				this.getNodeParameter('fieldsToExclude', 0, '') as string,
-				'Fields To Exclude',
-			);
-
-			if (!fieldsToExclude.length) {
-				throw new NodeOperationError(
-					this.getNode(),
-					'No fields specified. Please add a field to exclude from comparison',
-				);
-			}
-			if (!disableDotNotation) {
-				keys = Object.keys(flattenKeys(items[0].json));
-			}
-			keys = keys.filter((key) => !fieldsToExclude.includes(key));
-		}
-		if (compare === 'selectedFields') {
-			const fieldsToCompare = prepareFieldsArray(
-				this.getNodeParameter('fieldsToCompare', 0, '') as string,
-				'Fields To Compare',
-			);
-			if (!fieldsToCompare.length) {
-				throw new NodeOperationError(
-					this.getNode(),
-					'No fields specified. Please add a field to compare on',
-				);
-			}
-			if (!disableDotNotation) {
-				keys = Object.keys(flattenKeys(items[0].json));
-			}
-			keys = fieldsToCompare.map((key) => key.trim());
-		}
-
-		// This solution is O(nlogn)
-		// add original index to the items
-		const newItems = items.map(
-			(item, index) =>
-				({
-					json: { ...item.json, __INDEX: index },
-					pairedItem: { item: index },
-				}) as INodeExecutionData,
-		);
-		//sort items using the compare keys
-		newItems.sort((a, b) => {
-			let result = 0;
-
-			for (const key of keys) {
-				let equal;
-				if (!disableDotNotation) {
-					equal = isEqual(get(a.json, key), get(b.json, key));
-				} else {
-					equal = isEqual(a.json[key], b.json[key]);
-				}
-				if (!equal) {
-					let lessThan;
-					if (!disableDotNotation) {
-						lessThan = lt(get(a.json, key), get(b.json, key));
-					} else {
-						lessThan = lt(a.json[key], b.json[key]);
-					}
-					result = lessThan ? -1 : 1;
-					break;
-				}
-			}
-			return result;
-		});
-
-		validateInputData(this.getNode(), newItems, keys, disableDotNotation);
-
-		// collect the original indexes of items to be removed
-		const removedIndexes: number[] = [];
-		let temp = newItems[0];
-		for (let index = 1; index < newItems.length; index++) {
-			if (compareItems(newItems[index], temp, keys, disableDotNotation)) {
-				removedIndexes.push(newItems[index].json.__INDEX as unknown as number);
-			} else {
-				temp = newItems[index];
-			}
-		}
-
-		let returnData = items.filter((_, index) => !removedIndexes.includes(index));
-
-		if (removeOtherFields) {
-			returnData = returnData.map((item, index) => ({
-				json: pick(item.json, ...keys),
-				pairedItem: { item: index },
-			}));
-		}
-
-		return [returnData];
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/RemoveDuplicates.test.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/RemoveDuplicates.test.ts
index 4bf5f6b5b5..e063c46926 100644
--- a/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/RemoveDuplicates.test.ts
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/test/RemoveDuplicates.test.ts
@@ -1,7 +1,9 @@
 import type { INode } from 'n8n-workflow';
-import { validateInputData } from '../utils';
+
 import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
+import { validateInputData } from '../utils';
+
 const workflows = getWorkflowFilenames(__dirname);
 
 describe('Test Remove Duplicates Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/utils.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/utils.ts
index 532ff4ec3a..4fda255aa1 100644
--- a/packages/nodes-base/nodes/Transform/RemoveDuplicates/utils.ts
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/utils.ts
@@ -1,5 +1,11 @@
+import { isEqual, lt, pick } from 'lodash';
 import get from 'lodash/get';
-import { NodeOperationError, type INode, type INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import type { IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow';
+
+import { compareItems, flattenKeys } from '@utils/utilities';
+
+import { prepareFieldsArray } from '../utils/utils';
 
 export const validateInputData = (
 	node: INode,
@@ -39,3 +45,124 @@ export const validateInputData = (
 		}
 	}
 };
+
+export function removeDuplicateInputItems(context: IExecuteFunctions, items: INodeExecutionData[]) {
+	const compare = context.getNodeParameter('compare', 0) as string;
+	const disableDotNotation = context.getNodeParameter(
+		'options.disableDotNotation',
+		0,
+		false,
+	) as boolean;
+	const removeOtherFields = context.getNodeParameter(
+		'options.removeOtherFields',
+		0,
+		false,
+	) as boolean;
+
+	let keys = disableDotNotation
+		? Object.keys(items[0].json)
+		: Object.keys(flattenKeys(items[0].json));
+
+	for (const item of items) {
+		const itemKeys = disableDotNotation
+			? Object.keys(item.json)
+			: Object.keys(flattenKeys(item.json));
+		for (const key of itemKeys) {
+			if (!keys.includes(key)) {
+				keys.push(key);
+			}
+		}
+	}
+
+	if (compare === 'allFieldsExcept') {
+		const fieldsToExclude = prepareFieldsArray(
+			context.getNodeParameter('fieldsToExclude', 0, '') as string,
+			'Fields To Exclude',
+		);
+
+		if (!fieldsToExclude.length) {
+			throw new NodeOperationError(
+				context.getNode(),
+				'No fields specified. Please add a field to exclude from comparison',
+			);
+		}
+		if (!disableDotNotation) {
+			keys = Object.keys(flattenKeys(items[0].json));
+		}
+		keys = keys.filter((key) => !fieldsToExclude.includes(key));
+	}
+	if (compare === 'selectedFields') {
+		const fieldsToCompare = prepareFieldsArray(
+			context.getNodeParameter('fieldsToCompare', 0, '') as string,
+			'Fields To Compare',
+		);
+		if (!fieldsToCompare.length) {
+			throw new NodeOperationError(
+				context.getNode(),
+				'No fields specified. Please add a field to compare on',
+			);
+		}
+		if (!disableDotNotation) {
+			keys = Object.keys(flattenKeys(items[0].json));
+		}
+		keys = fieldsToCompare.map((key) => key.trim());
+	}
+
+	// This solution is O(nlogn)
+	// add original index to the items
+	const newItems = items.map(
+		(item, index) =>
+			({
+				json: { ...item.json, __INDEX: index },
+				pairedItem: { item: index },
+			}) as INodeExecutionData,
+	);
+	//sort items using the compare keys
+	newItems.sort((a, b) => {
+		let result = 0;
+
+		for (const key of keys) {
+			let equal;
+			if (!disableDotNotation) {
+				equal = isEqual(get(a.json, key), get(b.json, key));
+			} else {
+				equal = isEqual(a.json[key], b.json[key]);
+			}
+			if (!equal) {
+				let lessThan;
+				if (!disableDotNotation) {
+					lessThan = lt(get(a.json, key), get(b.json, key));
+				} else {
+					lessThan = lt(a.json[key], b.json[key]);
+				}
+				result = lessThan ? -1 : 1;
+				break;
+			}
+		}
+		return result;
+	});
+
+	validateInputData(context.getNode(), newItems, keys, disableDotNotation);
+
+	// collect the original indexes of items to be removed
+	const removedIndexes: number[] = [];
+	let temp = newItems[0];
+	for (let index = 1; index < newItems.length; index++) {
+		if (compareItems(newItems[index], temp, keys, disableDotNotation)) {
+			removedIndexes.push(newItems[index].json.__INDEX as unknown as number);
+		} else {
+			temp = newItems[index];
+		}
+	}
+	let updatedItems: INodeExecutionData[] = items.filter(
+		(_, index) => !removedIndexes.includes(index),
+	);
+
+	if (removeOtherFields) {
+		updatedItems = updatedItems.map((item, index) => ({
+			json: pick(item.json, ...keys),
+			pairedItem: { item: index },
+		}));
+	}
+	return [updatedItems];
+}
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/v1/RemoveDuplicatesV1.node.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/v1/RemoveDuplicatesV1.node.ts
new file mode 100644
index 0000000000..f4e0289107
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/v1/RemoveDuplicatesV1.node.ts
@@ -0,0 +1,122 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import { NodeConnectionType } from 'n8n-workflow';
+import type {
+	INodeTypeBaseDescription,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { removeDuplicateInputItems } from '../utils';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Remove Duplicates',
+	name: 'removeDuplicates',
+	icon: 'file:removeDuplicates.svg',
+	group: ['transform'],
+	subtitle: '',
+	version: [1, 1.1],
+	description: 'Delete items with matching field values',
+	defaults: {
+		name: 'Remove Duplicates',
+	},
+	inputs: [NodeConnectionType.Main],
+	outputs: [NodeConnectionType.Main],
+	properties: [
+		{
+			displayName: 'Compare',
+			name: 'compare',
+			type: 'options',
+			options: [
+				{
+					name: 'All Fields',
+					value: 'allFields',
+				},
+				{
+					name: 'All Fields Except',
+					value: 'allFieldsExcept',
+				},
+				{
+					name: 'Selected Fields',
+					value: 'selectedFields',
+				},
+			],
+			default: 'allFields',
+			description: 'The fields of the input items to compare to see if they are the same',
+		},
+		{
+			displayName: 'Fields To Exclude',
+			name: 'fieldsToExclude',
+			type: 'string',
+			placeholder: 'e.g. email, name',
+			requiresDataPath: 'multiple',
+			description: 'Fields in the input to exclude from the comparison',
+			default: '',
+			displayOptions: {
+				show: {
+					compare: ['allFieldsExcept'],
+				},
+			},
+		},
+		{
+			displayName: 'Fields To Compare',
+			name: 'fieldsToCompare',
+			type: 'string',
+			placeholder: 'e.g. email, name',
+			requiresDataPath: 'multiple',
+			description: 'Fields in the input to add to the comparison',
+			default: '',
+			displayOptions: {
+				show: {
+					compare: ['selectedFields'],
+				},
+			},
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Field',
+			default: {},
+			displayOptions: {
+				show: {
+					compare: ['allFieldsExcept', 'selectedFields'],
+				},
+			},
+			options: [
+				{
+					displayName: 'Disable Dot Notation',
+					name: 'disableDotNotation',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to disallow referencing child fields using `parent.child` in the field name',
+				},
+				{
+					displayName: 'Remove Other Fields',
+					name: 'removeOtherFields',
+					type: 'boolean',
+					default: false,
+					description:
+						'Whether to remove any fields that are not being compared. If disabled, will keep the values from the first of the duplicates.',
+				},
+			],
+		},
+	],
+};
+export class RemoveDuplicatesV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		return removeDuplicateInputItems(this, items);
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/RemoveDuplicatesV2.description.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/RemoveDuplicatesV2.description.ts
new file mode 100644
index 0000000000..88ab5a9bc4
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/RemoveDuplicatesV2.description.ts
@@ -0,0 +1,278 @@
+import type { INodeProperties } from 'n8n-workflow';
+const operationOptions = [
+	{
+		name: 'Remove Items Repeated Within Current Input',
+		value: 'removeDuplicateInputItems',
+		description: 'Remove duplicates from incoming items',
+		action: 'Remove items repeated within current input',
+	},
+	{
+		name: 'Remove Items Processed in Previous Executions',
+		value: 'removeItemsSeenInPreviousExecutions',
+		description: 'Deduplicate items already seen in previous executions',
+		action: 'Remove items processed in previous executions',
+	},
+	{
+		name: 'Clear Deduplication History',
+		value: 'clearDeduplicationHistory',
+		description: 'Wipe the store of previous items',
+		action: 'Clear deduplication history',
+	},
+];
+const compareOptions = [
+	{
+		name: 'All Fields',
+		value: 'allFields',
+	},
+	{
+		name: 'All Fields Except',
+		value: 'allFieldsExcept',
+	},
+	{
+		name: 'Selected Fields',
+		value: 'selectedFields',
+	},
+];
+const logicOptions = [
+	{
+		name: 'Value Is New',
+		value: 'removeItemsWithAlreadySeenKeyValues',
+		description: 'Remove all input items with values matching those already processed',
+	},
+	{
+		name: 'Value Is Higher than Any Previous Value',
+		value: 'removeItemsUpToStoredIncrementalKey',
+		description:
+			'Works with incremental values, removes all input items with values up to the stored value',
+	},
+	{
+		name: 'Value Is a Date Later than Any Previous Date',
+		value: 'removeItemsUpToStoredDate',
+		description:
+			'Works with date values, removes all input items with values up to the stored date',
+	},
+];
+const manageDatabaseModeOptions = [
+	{
+		name: 'Clean Database',
+		value: 'cleanDatabase',
+		description: 'Clear all values stored for a key in the database',
+	},
+];
+
+export const removeDuplicatesNodeFields: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: operationOptions,
+		default: 'removeDuplicateInputItems',
+	},
+	{
+		displayName: 'Compare',
+		name: 'compare',
+		type: 'options',
+		options: compareOptions,
+		default: 'allFields',
+		description: 'The fields of the input items to compare to see if they are the same',
+		displayOptions: {
+			show: {
+				operation: ['removeDuplicateInputItems'],
+			},
+		},
+	},
+	{
+		displayName: 'Fields To Exclude',
+		name: 'fieldsToExclude',
+		type: 'string',
+		placeholder: 'e.g. email, name',
+		requiresDataPath: 'multiple',
+		description: 'Fields in the input to exclude from the comparison',
+		default: '',
+		displayOptions: {
+			show: {
+				compare: ['allFieldsExcept'],
+			},
+		},
+	},
+	{
+		displayName: 'Fields To Compare',
+		name: 'fieldsToCompare',
+		type: 'string',
+		placeholder: 'e.g. email, name',
+		requiresDataPath: 'multiple',
+		description: 'Fields in the input to add to the comparison',
+		default: '',
+		displayOptions: {
+			show: {
+				compare: ['selectedFields'],
+			},
+		},
+	},
+
+	// ----------------------------------
+	{
+		displayName: 'Keep Items Where',
+		name: 'logic',
+		type: 'options',
+		noDataExpression: true,
+		options: logicOptions,
+		default: 'removeItemsWithAlreadySeenKeyValues',
+		description:
+			'How to select input items to remove by comparing them with key values previously processed',
+		displayOptions: {
+			show: {
+				operation: ['removeItemsSeenInPreviousExecutions'],
+			},
+		},
+	},
+	{
+		displayName: 'Value to Dedupe On',
+		name: 'dedupeValue',
+		type: 'string',
+		default: '',
+		description: 'Use an input field (or a combination of fields) that has a unique ID value',
+		hint: 'The input field value to compare between items',
+		placeholder: 'e.g. ID',
+		required: true,
+		displayOptions: {
+			show: {
+				logic: ['removeItemsWithAlreadySeenKeyValues'],
+				'/operation': ['removeItemsSeenInPreviousExecutions'],
+			},
+		},
+	},
+	{
+		displayName: 'Value to Dedupe On',
+		name: 'incrementalDedupeValue',
+		type: 'number',
+		default: '',
+		description: 'Use an input field (or a combination of fields) that has an incremental value',
+		hint: 'The input field value to compare between items, an incremental value is expected',
+		placeholder: 'e.g. ID',
+		displayOptions: {
+			show: {
+				logic: ['removeItemsUpToStoredIncrementalKey'],
+				'/operation': ['removeItemsSeenInPreviousExecutions'],
+			},
+		},
+	},
+	{
+		displayName: 'Value to Dedupe On',
+		name: 'dateDedupeValue',
+		type: 'dateTime',
+		default: '',
+		description: 'Use an input field that has a date value in ISO format',
+		hint: 'The input field value to compare between items, a date is expected',
+		placeholder: ' e.g. 2024-08-09T13:44:16Z',
+		displayOptions: {
+			show: {
+				logic: ['removeItemsUpToStoredDate'],
+				'/operation': ['removeItemsSeenInPreviousExecutions'],
+			},
+		},
+	},
+	{
+		displayName: 'Mode',
+		name: 'mode',
+		type: 'options',
+		default: 'cleanDatabase',
+		description:
+			'How you want to modify the key values stored on the database. None of these modes removes input items.',
+		displayOptions: {
+			show: {
+				operation: ['clearDeduplicationHistory'],
+			},
+		},
+		options: manageDatabaseModeOptions,
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'removeDuplicateInputItems',
+					'removeItemsSeenInPreviousExecutions',
+					'clearDeduplicationHistory',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Disable Dot Notation',
+				name: 'disableDotNotation',
+				type: 'boolean',
+				default: false,
+				displayOptions: {
+					show: {
+						'/operation': ['removeDuplicateInputItems'],
+					},
+					hide: {
+						'/compare': ['allFields'],
+					},
+				},
+				description:
+					'Whether to disallow referencing child fields using `parent.child` in the field name',
+			},
+			{
+				displayName: 'Remove Other Fields',
+				name: 'removeOtherFields',
+				type: 'boolean',
+				default: false,
+				displayOptions: {
+					show: {
+						'/operation': ['removeDuplicateInputItems'],
+					},
+					hide: {
+						'/compare': ['allFields'],
+					},
+				},
+				description:
+					'Whether to remove any fields that are not being compared. If disabled, will keep the values from the first of the duplicates.',
+			},
+			{
+				displayName: 'Scope',
+				name: 'scope',
+				type: 'options',
+				default: 'node',
+				displayOptions: {
+					show: {
+						'/operation': ['clearDeduplicationHistory', 'removeItemsSeenInPreviousExecutions'],
+					},
+				},
+				description:
+					'If set to ‘workflow,’ key values will be shared across all nodes in the workflow. If set to ‘node,’ key values will be specific to this node.',
+				options: [
+					{
+						name: 'Workflow',
+						value: 'workflow',
+						description: 'Deduplication info will be shared by all the nodes in the workflow',
+					},
+					{
+						name: 'Node',
+						value: 'node',
+						description: 'Deduplication info will be stored only for this node',
+					},
+				],
+			},
+			{
+				displayName: 'History Size',
+				name: 'historySize',
+				type: 'number',
+				default: 10000,
+				hint: 'The max number of past items to store for deduplication',
+				displayOptions: {
+					show: {
+						'/logic': ['removeItemsWithAlreadySeenKeyValues'],
+						'/operation': ['removeItemsSeenInPreviousExecutions'],
+					},
+				},
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/RemoveDuplicatesV2.node.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/RemoveDuplicatesV2.node.ts
new file mode 100644
index 0000000000..a4fa34d997
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/RemoveDuplicatesV2.node.ts
@@ -0,0 +1,277 @@
+import {
+	NodeConnectionType,
+	NodeExecutionOutput,
+	NodeOperationError,
+	tryToParseDateTime,
+} from 'n8n-workflow';
+import type {
+	INodeTypeBaseDescription,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	DeduplicationScope,
+} from 'n8n-workflow';
+
+import { removeDuplicatesNodeFields } from './RemoveDuplicatesV2.description';
+import { removeDuplicateInputItems } from '../utils';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Remove Duplicates',
+	name: 'removeDuplicates',
+	icon: 'file:removeDuplicates.svg',
+	group: ['transform'],
+	subtitle: '',
+	version: [2],
+	description: 'Delete items with matching field values',
+	defaults: {
+		name: 'Remove Duplicates',
+	},
+	inputs: [NodeConnectionType.Main],
+	outputs: [NodeConnectionType.Main],
+	outputNames: ['Kept', 'Discarded'],
+	hints: [
+		{
+			message: 'The dedupe key set in “Value to Dedupe On” has no value',
+			displayCondition:
+				'={{ $parameter["operation"] === "removeItemsSeenInPreviousExecutions" && ($parameter["logic"] === "removeItemsWithAlreadySeenKeyValues" && $parameter["dedupeValue"] === undefined) || ($parameter["logic"] === "removeItemsUpToStoredIncrementalKey" && $parameter["incrementalDedupeValue"] === undefined) || ($parameter["logic"] === "removeItemsUpToStoredDate" && $parameter["dateDedupeValue"] === undefined) }}',
+			whenToDisplay: 'beforeExecution',
+			location: 'outputPane',
+		},
+	],
+	properties: [...removeDuplicatesNodeFields],
+};
+export class RemoveDuplicatesV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const operation = this.getNodeParameter('operation', 0);
+		const returnData: INodeExecutionData[][] = [];
+		const DEFAULT_MAX_ENTRIES = 10000;
+		try {
+			switch (operation) {
+				case 'removeDuplicateInputItems': {
+					return removeDuplicateInputItems(this, items);
+				}
+				case 'removeItemsSeenInPreviousExecutions': {
+					const logic = this.getNodeParameter('logic', 0);
+					const scope = this.getNodeParameter('options.scope', 0, 'node') as DeduplicationScope;
+
+					if (logic === 'removeItemsWithAlreadySeenKeyValues') {
+						if (!['node', 'workflow'].includes(scope)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`The scope '${scope}' is not supported. Please select either "node" or "workflow".`,
+							);
+						}
+
+						let checkValue: string;
+						const itemMapping: {
+							[key: string]: INodeExecutionData[];
+						} = {};
+						for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+							checkValue = this.getNodeParameter('dedupeValue', itemIndex, '')?.toString() ?? '';
+							if (itemMapping[checkValue]) {
+								itemMapping[checkValue].push(items[itemIndex]);
+							} else {
+								itemMapping[checkValue] = [items[itemIndex]];
+							}
+						}
+
+						const maxEntries = this.getNodeParameter(
+							'options.historySize',
+							0,
+							DEFAULT_MAX_ENTRIES,
+						) as number;
+						const maxEntriesNum = Number(maxEntries);
+
+						const currentProcessedDataCount = await this.helpers.getProcessedDataCount(scope, {
+							mode: 'entries',
+							maxEntries,
+						});
+						if (currentProcessedDataCount + items.length > maxEntriesNum) {
+							throw new NodeOperationError(
+								this.getNode(),
+								'The number of items to be processed exceeds the maximum history size. Please increase the history size or reduce the number of items to be processed.',
+							);
+						}
+						const itemsProcessed = await this.helpers.checkProcessedAndRecord(
+							Object.keys(itemMapping),
+							scope,
+							{ mode: 'entries', maxEntries },
+						);
+						const processedDataCount = await this.helpers.getProcessedDataCount(scope, {
+							mode: 'entries',
+							maxEntries,
+						});
+						returnData.push(
+							itemsProcessed.new
+								.map((key) => {
+									return itemMapping[key];
+								})
+								.flat(),
+							itemsProcessed.processed
+								.map((key) => {
+									return itemMapping[key];
+								})
+								.flat(),
+						);
+
+						if (maxEntriesNum > 0 && processedDataCount / maxEntriesNum > 0.5) {
+							return new NodeExecutionOutput(returnData, [
+								{
+									message: `Some duplicates may be not be removed since you're approaching the maximum history size (${maxEntriesNum} items). You can raise this limit using the ‘history size’ option.`,
+									location: 'outputPane',
+								},
+							]);
+						} else return returnData;
+					} else if (logic === 'removeItemsUpToStoredIncrementalKey') {
+						if (!['node', 'workflow'].includes(scope)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`The scope '${scope}' is not supported. Please select either "node" or "workflow".`,
+							);
+						}
+
+						let parsedIncrementalKey: number;
+						const itemMapping: {
+							[key: string]: INodeExecutionData[];
+						} = {};
+
+						for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+							const incrementalKey = this.getNodeParameter('incrementalDedupeValue', itemIndex, '');
+							if (!incrementalKey?.toString()) {
+								throw new NodeOperationError(
+									this.getNode(),
+									'The `Value to Dedupe` On is empty. Please provide a value.',
+								);
+							}
+							parsedIncrementalKey = Number(incrementalKey);
+							if (isNaN(parsedIncrementalKey)) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`The value '${incrementalKey}' is not a number. Please provide a number.`,
+								);
+							}
+							if (itemMapping[parsedIncrementalKey]) {
+								itemMapping[parsedIncrementalKey].push(items[itemIndex]);
+							} else {
+								itemMapping[parsedIncrementalKey] = [items[itemIndex]];
+							}
+						}
+
+						const itemsProcessed = await this.helpers.checkProcessedAndRecord(
+							Object.keys(itemMapping),
+							scope,
+							{ mode: 'latestIncrementalKey' },
+						);
+
+						returnData.push(
+							itemsProcessed.new
+								.map((key) => {
+									return itemMapping[key];
+								})
+								.flat(),
+							itemsProcessed.processed
+								.map((key) => {
+									return itemMapping[key];
+								})
+								.flat(),
+						);
+
+						return returnData;
+					} else if (logic === 'removeItemsUpToStoredDate') {
+						if (!['node', 'workflow'].includes(scope)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`The scope '${scope}' is not supported. Please select either "node" or "workflow".`,
+							);
+						}
+
+						let checkValue: string;
+						const itemMapping: {
+							[key: string]: INodeExecutionData[];
+						} = {};
+
+						for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+							checkValue =
+								this.getNodeParameter('dateDedupeValue', itemIndex, '')?.toString() ?? '';
+							if (!checkValue) {
+								throw new NodeOperationError(
+									this.getNode(),
+									'The `Value to Dedupe` On is empty. Please provide a value.',
+								);
+							}
+							try {
+								tryToParseDateTime(checkValue);
+							} catch (error) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`The value '${checkValue}' is not a valid date. Please provide a valid date.`,
+								);
+							}
+							if (itemMapping[checkValue]) {
+								itemMapping[checkValue].push(items[itemIndex]);
+							} else {
+								itemMapping[checkValue] = [items[itemIndex]];
+							}
+						}
+						const itemsProcessed = await this.helpers.checkProcessedAndRecord(
+							Object.keys(itemMapping),
+							scope,
+							{ mode: 'latestDate' },
+						);
+
+						returnData.push(
+							itemsProcessed.new
+								.map((key) => {
+									return itemMapping[key];
+								})
+								.flat(),
+							itemsProcessed.processed
+								.map((key) => {
+									return itemMapping[key];
+								})
+								.flat(),
+						);
+
+						return returnData;
+					} else {
+						return [items];
+					}
+				}
+				case 'clearDeduplicationHistory': {
+					const mode = this.getNodeParameter('mode', 0) as string;
+					if (mode === 'updateKeyValuesInDatabase') {
+					} else if (mode === 'deleteKeyValuesFromDatabase') {
+					} else if (mode === 'cleanDatabase') {
+						const scope = this.getNodeParameter('options.scope', 0, 'node') as DeduplicationScope;
+						await this.helpers.clearAllProcessedItems(scope, {
+							mode: 'entries',
+						});
+					}
+
+					return [items];
+				}
+				default: {
+					return [items];
+				}
+			}
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push([{ json: this.getInputData(0)[0].json, error }]);
+			} else {
+				throw error;
+			}
+		}
+		return returnData;
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/test/RemoveDuplicates.test.ts b/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/test/RemoveDuplicates.test.ts
new file mode 100644
index 0000000000..84994b34e6
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/RemoveDuplicates/v2/test/RemoveDuplicates.test.ts
@@ -0,0 +1,131 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import { mock } from 'jest-mock-extended';
+import type { IExecuteFunctions, INodeExecutionData, INodeTypeBaseDescription } from 'n8n-workflow';
+
+import { RemoveDuplicatesV2 } from '../RemoveDuplicatesV2.node';
+
+describe('RemoveDuplicatesV2', () => {
+	let node: RemoveDuplicatesV2;
+	let executeFunctions: IExecuteFunctions;
+
+	beforeEach(() => {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Remove Duplicates',
+			name: 'removeDuplicates',
+			icon: 'file:removeDuplicates.svg',
+			group: ['transform'],
+			description: 'Delete items with matching field values',
+		};
+		node = new RemoveDuplicatesV2(baseDescription);
+		executeFunctions = mock<IExecuteFunctions>();
+		executeFunctions.helpers = {
+			checkProcessedAndRecord: jest.fn(),
+			clearAllProcessedItems: jest.fn(),
+		} as any;
+		executeFunctions.getInputData = jest.fn();
+		executeFunctions.getNodeParameter = jest.fn();
+	});
+
+	it('should Remove items repeated within current input based on all fields', async () => {
+		const items: INodeExecutionData[] = [
+			{ json: { id: 1, name: 'John' } },
+			{ json: { id: 2, name: 'Jane' } },
+			{ json: { id: 1, name: 'John' } },
+		];
+
+		(executeFunctions.getInputData as jest.Mock<any>).mockReturnValue(items);
+		(executeFunctions.getNodeParameter as jest.Mock<any, any>).mockImplementation(
+			(paramName: string) => {
+				if (paramName === 'operation') return 'removeDuplicateInputItems';
+				if (paramName === 'compare') return 'allFields';
+				return undefined;
+			},
+		);
+
+		const result = await node.execute.call(executeFunctions);
+		expect(result).toHaveLength(1);
+		expect(result[0]).toHaveLength(2);
+		expect(result[0][0].json).toEqual({ id: 1, name: 'John' });
+		expect(result[0][1].json).toEqual({ id: 2, name: 'Jane' });
+	});
+
+	it('should Remove items repeated within current input based on selected fields', async () => {
+		const items: INodeExecutionData[] = [
+			{ json: { id: 1, name: 'John' } },
+			{ json: { id: 2, name: 'Jane' } },
+			{ json: { id: 1, name: 'Doe' } },
+		];
+
+		(executeFunctions.getInputData as jest.Mock<any, any>).mockReturnValue(items);
+		(executeFunctions.getNodeParameter as jest.Mock<any, any>).mockImplementation(
+			(paramName: string) => {
+				if (paramName === 'operation') return 'removeDuplicateInputItems';
+				if (paramName === 'compare') return 'selectedFields';
+				if (paramName === 'fieldsToCompare') return 'id';
+				return undefined;
+			},
+		);
+
+		const result = await node.execute.call(executeFunctions);
+		expect(result).toHaveLength(1);
+		expect(result[0]).toHaveLength(2);
+		expect(result[0][0].json).toEqual({ id: 1, name: 'John' });
+		expect(result[0][1].json).toEqual({ id: 2, name: 'Jane' });
+	});
+
+	it('should remove items seen in previous executions', async () => {
+		const items: INodeExecutionData[] = [
+			{ json: { id: 1, name: 'John' } },
+			{ json: { id: 2, name: 'Jane' } },
+			{ json: { id: 3, name: 'Doe' } },
+		];
+
+		(executeFunctions.getInputData as jest.Mock<any, any>).mockReturnValue(items);
+		(executeFunctions.getNodeParameter as jest.Mock<any, any>).mockImplementation(
+			(paramName: string, itemIndex: number) => {
+				if (paramName === 'operation') return 'removeItemsSeenInPreviousExecutions';
+				if (paramName === 'logic') return 'removeItemsWithAlreadySeenKeyValues';
+				if (paramName === 'dedupeValue' && itemIndex === 0) return 1;
+				if (paramName === 'dedupeValue' && itemIndex === 1) return 2;
+				if (paramName === 'dedupeValue' && itemIndex === 2) return 3;
+				if (paramName === 'options.scope') return 'node';
+				if (paramName === 'options.historySize') return 10;
+			},
+		);
+		executeFunctions.helpers.getProcessedDataCount = jest.fn().mockReturnValue(3);
+		(executeFunctions.helpers.checkProcessedAndRecord as jest.Mock).mockReturnValue({
+			new: [1, 3],
+			processed: [2],
+		});
+
+		const result = await node.execute.call(executeFunctions);
+		expect(result).toHaveLength(2);
+		expect(result[0]).toHaveLength(2);
+		expect(result[1]).toHaveLength(1);
+		expect(result[0][0].json).toEqual({ id: 1, name: 'John' });
+		expect(result[0][1].json).toEqual({ id: 3, name: 'Doe' });
+	});
+
+	it('should clean database when managing key values', async () => {
+		const items: INodeExecutionData[] = [
+			{ json: { id: 1, name: 'John' } },
+			{ json: { id: 2, name: 'Jane' } },
+		];
+
+		(executeFunctions.getInputData as jest.Mock<any, any>).mockReturnValue(items);
+		(executeFunctions.getNodeParameter as jest.Mock<any, any>).mockImplementation(
+			(paramName: string) => {
+				if (paramName === 'operation') return 'clearDeduplicationHistory';
+				if (paramName === 'mode') return 'cleanDatabase';
+				if (paramName === 'options.scope') return 'node';
+				return undefined;
+			},
+		);
+
+		const result = await node.execute.call(executeFunctions);
+		expect(result).toHaveLength(1);
+		expect(result[0]).toHaveLength(2);
+		expect(result[0][0].json).toEqual({ id: 1, name: 'John' });
+		expect(result[0][1].json).toEqual({ id: 2, name: 'Jane' });
+	});
+});
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index 5da813981b..43c092beed 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -238,14 +238,6 @@ export class Wait extends Webhook {
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.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,
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
index 055d6ea6ab..3fb4ac5830 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -44,6 +44,7 @@ export class WooCommerce implements INodeType {
 		},
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'wooCommerceApi',
diff --git a/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.ts b/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.ts
index 7c6a2babf1..8b67094865 100644
--- a/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.ts
@@ -12,6 +12,7 @@ type activationType = 'activate' | 'update';
 export class WorkflowTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Workflow Trigger',
+		hidden: true,
 		name: 'workflowTrigger',
 		icon: 'fa:network-wired',
 		iconColor: 'orange-red',
@@ -28,6 +29,13 @@ export class WorkflowTrigger implements INodeType {
 		inputs: [],
 		outputs: [NodeConnectionType.Main],
 		properties: [
+			{
+				displayName:
+					"This node is deprecated and would not be updated in the future. Please use 'n8n Trigger' node instead.",
+				name: 'oldVersionNotice',
+				type: 'notice',
+				default: '',
+			},
 			{
 				displayName: 'Events',
 				name: 'events',
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
index 8fe40e8420..5ac813bda0 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.filesreadwrite/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readwritefile/"
 			}
 		],
 		"generic": [
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4f37056d17..5d34b070de 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.61.0",
+  "version": "1.63.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
@@ -331,6 +331,7 @@
       "dist/credentials/SurveyMonkeyApi.credentials.js",
       "dist/credentials/SurveyMonkeyOAuth2Api.credentials.js",
       "dist/credentials/SyncroMspApi.credentials.js",
+      "dist/credentials/SysdigApi.credentials.js",
       "dist/credentials/TaigaApi.credentials.js",
       "dist/credentials/TapfiliateApi.credentials.js",
       "dist/credentials/TelegramApi.credentials.js",
@@ -836,25 +837,27 @@
     "n8n-core": "workspace:*"
   },
   "dependencies": {
+    "@aws-sdk/client-sso-oidc": "3.666.0",
     "@kafkajs/confluent-schema-registry": "1.0.6",
+    "@n8n/config": "workspace:*",
     "@n8n/imap": "workspace:*",
     "@n8n/vm2": "3.9.25",
+    "alasql": "4.4.0",
     "amqplib": "0.10.3",
-    "alasql": "^4.4.0",
     "aws4": "1.11.0",
     "basic-auth": "catalog:",
     "change-case": "4.1.2",
     "cheerio": "1.0.0-rc.6",
-    "chokidar": "3.5.2",
+    "chokidar": "catalog:",
     "cron": "3.1.7",
     "csv-parse": "5.5.0",
     "currency-codes": "2.1.0",
     "eventsource": "2.0.2",
-    "html-to-text": "9.0.5",
     "fast-glob": "catalog:",
     "fflate": "0.7.4",
     "get-system-fonts": "2.0.2",
     "gm": "1.25.0",
+    "html-to-text": "9.0.5",
     "iconv-lite": "0.6.3",
     "ics": "2.40.0",
     "isbot": "3.6.13",
@@ -879,14 +882,14 @@
     "nodemailer": "6.9.9",
     "otpauth": "9.1.1",
     "pdfjs-dist": "2.16.105",
-    "pg": "8.12.0",
     "pg-promise": "11.9.1",
+    "pg": "8.12.0",
     "promise-ftp": "1.3.5",
     "pyodide": "0.23.4",
     "redis": "4.6.14",
     "rfc2047": "4.0.1",
     "rhea": "1.0.24",
-    "rrule": "^2.8.1",
+    "rrule": "2.8.1",
     "rss-parser": "3.13.0",
     "semver": "7.5.4",
     "showdown": "2.1.0",
@@ -894,7 +897,7 @@
     "snowflake-sdk": "1.12.0",
     "ssh2-sftp-client": "7.2.3",
     "tmp-promise": "3.0.3",
-    "ts-ics": "^1.2.2",
+    "ts-ics": "1.2.2",
     "typedi": "catalog:",
     "uuid": "catalog:",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
diff --git a/packages/nodes-base/test/nodes/TriggerHelpers.ts b/packages/nodes-base/test/nodes/TriggerHelpers.ts
new file mode 100644
index 0000000000..93b4dfae9e
--- /dev/null
+++ b/packages/nodes-base/test/nodes/TriggerHelpers.ts
@@ -0,0 +1,241 @@
+import type * as express from 'express';
+import { mock } from 'jest-mock-extended';
+import get from 'lodash/get';
+import merge from 'lodash/merge';
+import set from 'lodash/set';
+import { getExecutePollFunctions, returnJsonArray, type InstanceSettings } from 'n8n-core';
+import { ScheduledTaskManager } from 'n8n-core/dist/ScheduledTaskManager';
+import type {
+	IBinaryData,
+	ICredentialDataDecryptedObject,
+	IDataObject,
+	IHttpRequestOptions,
+	INode,
+	INodeType,
+	INodeTypes,
+	IPollFunctions,
+	ITriggerFunctions,
+	IWebhookFunctions,
+	IWorkflowExecuteAdditionalData,
+	NodeTypeAndVersion,
+	VersionedNodeType,
+	Workflow,
+	WorkflowHooks,
+} from 'n8n-workflow';
+
+type MockDeepPartial<T> = Parameters<typeof mock<T>>[0];
+
+type TestTriggerNodeOptions = {
+	mode?: 'manual' | 'trigger';
+	node?: MockDeepPartial<INode>;
+	timezone?: string;
+	workflowStaticData?: IDataObject;
+	credential?: ICredentialDataDecryptedObject;
+};
+
+type TestWebhookTriggerNodeOptions = TestTriggerNodeOptions & {
+	webhookName?: string;
+	request?: MockDeepPartial<express.Request>;
+	bodyData?: IDataObject;
+	childNodes?: NodeTypeAndVersion[];
+};
+
+type TestPollingTriggerNodeOptions = TestTriggerNodeOptions & {};
+
+function getNodeVersion(Trigger: new () => VersionedNodeType, version?: number) {
+	const instance = new Trigger();
+	return instance.nodeVersions[version ?? instance.currentVersion];
+}
+
+export async function testVersionedTriggerNode(
+	Trigger: new () => VersionedNodeType,
+	version?: number,
+	options: TestTriggerNodeOptions = {},
+) {
+	return await testTriggerNode(getNodeVersion(Trigger, version), options);
+}
+
+export async function testTriggerNode(
+	Trigger: (new () => INodeType) | INodeType,
+	options: TestTriggerNodeOptions = {},
+) {
+	const trigger = 'description' in Trigger ? Trigger : new Trigger();
+	const emit: jest.MockedFunction<ITriggerFunctions['emit']> = jest.fn();
+
+	const timezone = options.timezone ?? 'Europe/Berlin';
+	const version = trigger.description.version;
+	const node = merge(
+		{
+			type: trigger.description.name,
+			name: trigger.description.defaults.name ?? `Test Node (${trigger.description.name})`,
+			typeVersion: typeof version === 'number' ? version : version.at(-1),
+		} satisfies Partial<INode>,
+		options.node,
+	) as INode;
+	const workflow = mock<Workflow>({ timezone: options.timezone ?? 'Europe/Berlin' });
+
+	const scheduledTaskManager = new ScheduledTaskManager(mock<InstanceSettings>());
+	const helpers = mock<ITriggerFunctions['helpers']>({
+		returnJsonArray,
+		registerCron: (cronExpression, onTick) =>
+			scheduledTaskManager.registerCron(workflow, cronExpression, onTick),
+	});
+
+	const triggerFunctions = mock<ITriggerFunctions>({
+		helpers,
+		emit,
+		getTimezone: () => timezone,
+		getNode: () => node,
+		getMode: () => options.mode ?? 'trigger',
+		getWorkflowStaticData: () => options.workflowStaticData ?? {},
+		getNodeParameter: (parameterName, fallback) => get(node.parameters, parameterName) ?? fallback,
+	});
+
+	const response = await trigger.trigger?.call(triggerFunctions);
+
+	if (options.mode === 'manual') {
+		expect(response?.manualTriggerFunction).toBeInstanceOf(Function);
+		await response?.manualTriggerFunction?.();
+	} else {
+		expect(response?.manualTriggerFunction).toBeUndefined();
+	}
+
+	return {
+		close: jest.fn(response?.closeFunction),
+		emit,
+	};
+}
+
+export async function testVersionedWebhookTriggerNode(
+	Trigger: new () => VersionedNodeType,
+	version?: number,
+	options: TestWebhookTriggerNodeOptions = {},
+) {
+	return await testWebhookTriggerNode(getNodeVersion(Trigger, version), options);
+}
+
+export async function testWebhookTriggerNode(
+	Trigger: (new () => INodeType) | INodeType,
+	options: TestWebhookTriggerNodeOptions = {},
+) {
+	const trigger = 'description' in Trigger ? Trigger : new Trigger();
+
+	const timezone = options.timezone ?? 'Europe/Berlin';
+	const version = trigger.description.version;
+	const node = merge(
+		{
+			type: trigger.description.name,
+			name: trigger.description.defaults.name ?? `Test Node (${trigger.description.name})`,
+			typeVersion: typeof version === 'number' ? version : version.at(-1),
+		} satisfies Partial<INode>,
+		options.node,
+	) as INode;
+	const workflow = mock<Workflow>({ timezone: options.timezone ?? 'Europe/Berlin' });
+
+	const scheduledTaskManager = new ScheduledTaskManager(mock<InstanceSettings>());
+	const helpers = mock<ITriggerFunctions['helpers']>({
+		returnJsonArray,
+		registerCron: (cronExpression, onTick) =>
+			scheduledTaskManager.registerCron(workflow, cronExpression, onTick),
+	});
+
+	const request = mock<express.Request>({
+		method: 'GET',
+		...options.request,
+	});
+	const response = mock<express.Response>({ status: jest.fn(() => mock<express.Response>()) });
+	const webhookFunctions = mock<IWebhookFunctions>({
+		helpers,
+		nodeHelpers: {
+			copyBinaryFile: jest.fn(async () => mock<IBinaryData>()),
+		},
+		getTimezone: () => timezone,
+		getNode: () => node,
+		getMode: () => options.mode ?? 'trigger',
+		getInstanceId: () => 'instanceId',
+		getBodyData: () => options.bodyData ?? {},
+		getHeaderData: () => ({}),
+		getInputConnectionData: async () => ({}),
+		getNodeWebhookUrl: (name) => `/test-webhook-url/${name}`,
+		getParamsData: () => ({}),
+		getQueryData: () => ({}),
+		getRequestObject: () => request,
+		getResponseObject: () => response,
+		getWebhookName: () => options.webhookName ?? 'default',
+		getWorkflowStaticData: () => options.workflowStaticData ?? {},
+		getNodeParameter: (parameterName, fallback) => get(node.parameters, parameterName) ?? fallback,
+		getChildNodes: () => options.childNodes ?? [],
+	});
+
+	const responseData = await trigger.webhook?.call(webhookFunctions);
+
+	return {
+		responseData,
+		response: webhookFunctions.getResponseObject(),
+	};
+}
+
+export async function testPollingTriggerNode(
+	Trigger: (new () => INodeType) | INodeType,
+	options: TestPollingTriggerNodeOptions = {},
+) {
+	const trigger = 'description' in Trigger ? Trigger : new Trigger();
+
+	const timezone = options.timezone ?? 'Europe/Berlin';
+	const version = trigger.description.version;
+	const node = merge(
+		{
+			type: trigger.description.name,
+			name: trigger.description.defaults.name ?? `Test Node (${trigger.description.name})`,
+			typeVersion: typeof version === 'number' ? version : version.at(-1),
+			credentials: {},
+		} satisfies Partial<INode>,
+		options.node,
+	) as INode;
+	const workflow = mock<Workflow>({
+		timezone: options.timezone ?? 'Europe/Berlin',
+		nodeTypes: mock<INodeTypes>({
+			getByNameAndVersion: () => mock<INodeType>({ description: trigger.description }),
+		}),
+	});
+	const mode = options.mode ?? 'trigger';
+
+	const originalPollingFunctions = getExecutePollFunctions(
+		workflow,
+		node,
+		mock<IWorkflowExecuteAdditionalData>({
+			currentNodeParameters: node.parameters,
+			credentialsHelper: mock<IWorkflowExecuteAdditionalData['credentialsHelper']>({
+				getParentTypes: () => [],
+				authenticate: async (_creds, _type, options) => {
+					set(options, 'headers.authorization', 'mockAuth');
+					return options as IHttpRequestOptions;
+				},
+			}),
+			hooks: mock<WorkflowHooks>(),
+		}),
+		mode,
+		'init',
+	);
+
+	async function getCredentials<T extends object = ICredentialDataDecryptedObject>(): Promise<T> {
+		return (options.credential ?? {}) as T;
+	}
+
+	const pollingFunctions = mock<IPollFunctions>({
+		...originalPollingFunctions,
+		getCredentials,
+		getTimezone: () => timezone,
+		getNode: () => node,
+		getMode: () => mode,
+		getInstanceId: () => 'instanceId',
+		getWorkflowStaticData: () => options.workflowStaticData ?? {},
+		getNodeParameter: (parameterName, fallback) => get(node.parameters, parameterName) ?? fallback,
+	});
+
+	const response = await trigger.poll?.call(pollingFunctions);
+
+	return {
+		response,
+	};
+}
diff --git a/packages/nodes-base/utils/sendAndWait/email-templates.ts b/packages/nodes-base/utils/sendAndWait/email-templates.ts
new file mode 100644
index 0000000000..0ae8d7689a
--- /dev/null
+++ b/packages/nodes-base/utils/sendAndWait/email-templates.ts
@@ -0,0 +1,141 @@
+export const BUTTON_STYLE_SECONDARY =
+	'display:inline-block; text-decoration:none; background-color:#fff; color:#4a4a4a; padding:12px 24px; font-family: Arial,sans-serif; font-size:14px;font-weight:600; border:1px solid #d1d1d1; border-radius:6px; min-width:120px; margin: 12px 6px 0 6px;';
+export const BUTTON_STYLE_PRIMARY =
+	'display:inline-block; text-decoration:none; background-color:#ff6d5a; color: #fff; padding:12px 24px; font-family: Arial,sans-serif; font-size:14px;font-weight:600; border-radius:6px; min-width:120px; margin: 12px 2px 0 2px;';
+
+export const ACTION_RECORDED_PAGE = `
+	<html lang='en'>
+
+	<head>
+		<meta charset='UTF-8' />
+		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
+		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
+		<link
+			href='http://fonts.googleapis.com/css?family=Open+Sans'
+			rel='stylesheet'
+			type='text/css'
+		/>
+		<title>Action recorded</title>
+		<style>
+			*, ::after, ::before { box-sizing: border-box; margin: 0; padding: 0; } body { font-family:
+			Open Sans, sans-serif; font-weight: 400; font-size: 12px; display: flex; flex-direction:
+			column; justify-content: start; background-color: #FBFCFE; } .container { margin: auto;
+			text-align: center; padding-top: 24px; width: 448px; } .card { padding: 24px;
+			background-color: white; border: 1px solid #DBDFE7; border-radius: 8px; box-shadow: 0px 4px
+			16px 0px #634DFF0F; margin-bottom: 16px; } .n8n-link a { color: #7E8186; font-weight: 600;
+			font-size: 12px; text-decoration: none; } .n8n-link svg { display: inline-block;
+			vertical-align: middle; } .header h1 { color: #525356; font-size: 20px; font-weight: 400;
+			padding-bottom: 8px; } .header p { color: #7E8186; font-size: 14px; font-weight: 400; }
+		</style>
+	</head>
+
+	<body>
+		<div class='container'>
+			<section>
+				<div class='card'>
+					<div class='header'>
+						<h1>Got it, thanks</h1>
+						<p>This page can be closed now</p>
+					</div>
+				</div>
+				<div class='n8n-link'>
+					<a
+						href='https://n8n.io/?utm_source=n8n-internal&amp;utm_medium=send-and-wait'
+						target='_blank'
+					>
+						Automated with
+						<svg
+							width='73'
+							height='20'
+							viewBox='0 0 73 20'
+							fill='none'
+							xmlns='http://www.w3.org/2000/svg'
+						>
+							<path
+								fill-rule='evenodd'
+								clip-rule='evenodd'
+								d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
+								fill='#EA4B71'
+							></path>
+							<path
+								d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
+								fill='#101330'
+							></path>
+							<path
+								d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
+								fill='#101330'
+							></path>
+							<path
+								d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
+								fill='#101330'
+							></path>
+						</svg>
+
+					</a>
+				</div>
+			</section>
+		</div>
+	</body>
+
+</html>`;
+
+export function createEmailBody(message: string, buttons: string, instanceId?: string) {
+	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
+	const n8nWebsiteLink = `https://n8n.io/?utm_source=n8n-internal&utm_medium=send-and-wait${utm_campaign}`;
+	return `
+<!DOCTYPE html>
+<html lang='en'>
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>My form</title>
+</head>
+
+<body
+	style="font-family: Arial, sans-serif; font-size: 12px; background-color: #fbfcfe; margin: 0; padding: 0;">
+	<table width="100%" cellpadding="0" cellspacing="0"
+		style="background-color:#fbfcfe; border: 1px solid #dbdfe7; border-radius: 8px;">
+		<tr>
+			<td align="center" style="padding: 24px 0;">
+				<table width="448" cellpadding="0" cellspacing="0" border="0"
+					style="width: 100%; max-width: 448px; background-color: #ffffff; border: 1px solid #dbdfe7; border-radius: 8px; padding: 24px; box-shadow: 0px 4px 16px rgba(99, 77, 255, 0.06);">
+					<tr>
+						<td
+							style="text-align: center; padding-top: 8px; font-family: Arial, sans-serif; font-size: 14px; color: #7e8186;">
+							<p>${message}</p>
+						</td>
+					</tr>
+					<tr>
+						<td align="center" style="padding-top: 12px;">
+								${buttons}
+						</td>
+					</tr>
+				</table>
+
+				<!-- Divider -->
+				<table width="100%" cellpadding="0" cellspacing="0" border="0" style="margin-bottom: 24px;">
+					<tr>
+						<td style="border-top: 0px solid #dbdfe7;"></td>
+					</tr>
+				</table>
+
+				<!-- Footer -->
+				<table width="100%" cellpadding="0" cellspacing="0" border="0"
+					style="text-align: center; color: #7e8186; font-family: Arial, sans-serif; font-size: 12px;">
+					<tr>
+						<td>
+							<a href=${n8nWebsiteLink}
+								target="_blank" style="color: #7e8186; text-decoration: none;">Automated with
+								n8n</a>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</body>
+
+</html>
+	`;
+}
diff --git a/packages/nodes-base/utils/sendAndWait/interfaces.ts b/packages/nodes-base/utils/sendAndWait/interfaces.ts
new file mode 100644
index 0000000000..bb7a20b9ea
--- /dev/null
+++ b/packages/nodes-base/utils/sendAndWait/interfaces.ts
@@ -0,0 +1,15 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export interface IEmail {
+	from?: string;
+	to?: string;
+	cc?: string;
+	bcc?: string;
+	replyTo?: string;
+	inReplyTo?: string;
+	reference?: string;
+	subject: string;
+	body: string;
+	htmlBody?: string;
+	attachments?: IDataObject[];
+}
diff --git a/packages/nodes-base/utils/sendAndWait/test/util.test.ts b/packages/nodes-base/utils/sendAndWait/test/util.test.ts
new file mode 100644
index 0000000000..16e37c7790
--- /dev/null
+++ b/packages/nodes-base/utils/sendAndWait/test/util.test.ts
@@ -0,0 +1,212 @@
+import { type MockProxy, mock } from 'jest-mock-extended';
+import type { IExecuteFunctions, INodeProperties, IWebhookFunctions } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import {
+	getSendAndWaitProperties,
+	getSendAndWaitConfig,
+	createEmail,
+	sendAndWaitWebhook,
+	MESSAGE_PREFIX,
+} from '../utils';
+
+describe('Send and Wait utils tests', () => {
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+	let mockWebhookFunctions: MockProxy<IWebhookFunctions>;
+
+	beforeEach(() => {
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+		mockWebhookFunctions = mock<IWebhookFunctions>();
+	});
+
+	describe('getSendAndWaitProperties', () => {
+		it('should return properties with correct display options', () => {
+			const targetProperties: INodeProperties[] = [
+				{
+					displayName: 'Test Property',
+					name: 'testProperty',
+					type: 'string',
+					default: '',
+				},
+			];
+
+			const result = getSendAndWaitProperties(targetProperties);
+
+			expect(result).toEqual(
+				expect.arrayContaining([
+					expect.objectContaining({
+						displayOptions: {
+							show: {
+								resource: ['message'],
+								operation: ['sendAndWait'],
+							},
+						},
+					}),
+				]),
+			);
+		});
+	});
+
+	describe('getSendAndWaitConfig', () => {
+		it('should return correct config for single approval', () => {
+			mockExecuteFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					message: 'Test message',
+					subject: 'Test subject',
+					'approvalOptions.values': {
+						approvalType: 'single',
+						approveLabel: 'Approve',
+						buttonApprovalStyle: 'primary',
+					},
+				};
+				return params[parameterName];
+			});
+
+			mockExecuteFunctions.evaluateExpression.mockImplementation((expression: string) => {
+				const expressions: { [key: string]: string } = {
+					'{{ $execution?.resumeUrl }}': 'http://localhost',
+					'{{ $nodeId }}': 'testNodeId',
+				};
+				return expressions[expression];
+			});
+
+			const config = getSendAndWaitConfig(mockExecuteFunctions);
+
+			expect(config).toEqual({
+				title: 'Test subject',
+				message: 'Test message',
+				url: 'http://localhost/testNodeId',
+				options: [
+					{
+						label: 'Approve',
+						value: 'true',
+						style: 'primary',
+					},
+				],
+			});
+		});
+
+		it('should return correct config for double approval', () => {
+			mockExecuteFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					message: 'Test message',
+					subject: 'Test subject',
+					'approvalOptions.values': {
+						approvalType: 'double',
+						approveLabel: 'Approve',
+						buttonApprovalStyle: 'primary',
+						disapproveLabel: 'Reject',
+						buttonDisapprovalStyle: 'secondary',
+					},
+				};
+				return params[parameterName];
+			});
+
+			mockExecuteFunctions.evaluateExpression.mockImplementation((expression: string) => {
+				const expressions: { [key: string]: string } = {
+					'{{ $execution?.resumeUrl }}': 'http://localhost',
+					'{{ $nodeId }}': 'testNodeId',
+				};
+				return expressions[expression];
+			});
+
+			const config = getSendAndWaitConfig(mockExecuteFunctions);
+
+			expect(config.options).toHaveLength(2);
+			expect(config.options).toEqual(
+				expect.arrayContaining([
+					{
+						label: 'Reject',
+						value: 'false',
+						style: 'secondary',
+					},
+					{
+						label: 'Approve',
+						value: 'true',
+						style: 'primary',
+					},
+				]),
+			);
+		});
+	});
+
+	describe('createEmail', () => {
+		beforeEach(() => {
+			mockExecuteFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					sendTo: 'test@example.com',
+					message: 'Test message',
+					subject: 'Test subject',
+					'approvalOptions.values': {
+						approvalType: 'single',
+						approveLabel: 'Approve',
+						buttonApprovalStyle: 'primary',
+					},
+				};
+				return params[parameterName];
+			});
+
+			mockExecuteFunctions.evaluateExpression.mockImplementation((expression: string) => {
+				const expressions: { [key: string]: string } = {
+					'{{ $execution?.resumeUrl }}': 'http://localhost',
+					'{{ $nodeId }}': 'testNodeId',
+				};
+				return expressions[expression];
+			});
+		});
+
+		it('should create a valid email object', () => {
+			const email = createEmail(mockExecuteFunctions);
+
+			expect(email).toEqual({
+				to: 'test@example.com',
+				subject: `${MESSAGE_PREFIX}Test subject`,
+				body: '',
+				htmlBody: expect.stringContaining('Test message'),
+			});
+		});
+
+		it('should throw NodeOperationError for invalid email address', () => {
+			mockExecuteFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					sendTo: 'invalid@@email.com',
+					message: 'Test message',
+					subject: 'Test subject',
+					'approvalOptions.values': {
+						approvalType: 'single',
+					},
+				};
+				return params[parameterName];
+			});
+
+			expect(() => createEmail(mockExecuteFunctions)).toThrow(NodeOperationError);
+		});
+	});
+
+	describe('sendAndWaitWebhook', () => {
+		it('should handle approved webhook', async () => {
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				query: { approved: 'true' },
+			} as any);
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result).toEqual({
+				webhookResponse: expect.any(String),
+				workflowData: [[{ json: { data: { approved: true } } }]],
+			});
+		});
+
+		it('should handle disapproved webhook', async () => {
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				query: { approved: 'false' },
+			} as any);
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result).toEqual({
+				webhookResponse: expect.any(String),
+				workflowData: [[{ json: { data: { approved: false } } }]],
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/utils/sendAndWait/utils.ts b/packages/nodes-base/utils/sendAndWait/utils.ts
new file mode 100644
index 0000000000..fd633fe519
--- /dev/null
+++ b/packages/nodes-base/utils/sendAndWait/utils.ts
@@ -0,0 +1,254 @@
+import { NodeOperationError, SEND_AND_WAIT_OPERATION, updateDisplayOptions } from 'n8n-workflow';
+import type { INodeProperties, IExecuteFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IEmail } from './interfaces';
+import { escapeHtml } from '../utilities';
+import {
+	ACTION_RECORDED_PAGE,
+	BUTTON_STYLE_PRIMARY,
+	BUTTON_STYLE_SECONDARY,
+	createEmailBody,
+} from './email-templates';
+
+type SendAndWaitConfig = {
+	title: string;
+	message: string;
+	url: string;
+	options: Array<{ label: string; value: string; style: string }>;
+};
+
+export const MESSAGE_PREFIX = 'ACTION REQUIRED: ';
+
+// Operation Properties ----------------------------------------------------------
+export function getSendAndWaitProperties(
+	targetProperties: INodeProperties[],
+	resource: string = 'message',
+	additionalProperties: INodeProperties[] = [],
+) {
+	const buttonStyle: INodeProperties = {
+		displayName: 'Button Style',
+		name: 'buttonStyle',
+		type: 'options',
+		default: 'primary',
+		options: [
+			{
+				name: 'Primary',
+				value: 'primary',
+			},
+			{
+				name: 'Secondary',
+				value: 'secondary',
+			},
+		],
+	};
+	const sendAndWait: INodeProperties[] = [
+		...targetProperties,
+		{
+			displayName: 'Subject',
+			name: 'subject',
+			type: 'string',
+			default: '',
+			required: true,
+			placeholder: 'e.g. Approval required',
+		},
+		{
+			displayName: 'Message',
+			name: 'message',
+			type: 'string',
+			default: '',
+			required: true,
+			typeOptions: {
+				rows: 5,
+			},
+		},
+		{
+			displayName: 'Approval Options',
+			name: 'approvalOptions',
+			type: 'fixedCollection',
+			placeholder: 'Add option',
+			default: {},
+			options: [
+				{
+					displayName: 'Values',
+					name: 'values',
+					values: [
+						{
+							displayName: 'Type of Approval',
+							name: 'approvalType',
+							type: 'options',
+							placeholder: 'Add option',
+							default: 'single',
+							options: [
+								{
+									name: 'Approve Only',
+									value: 'single',
+								},
+								{
+									name: 'Approve and Disapprove',
+									value: 'double',
+								},
+							],
+						},
+						{
+							displayName: 'Approve Button Label',
+							name: 'approveLabel',
+							type: 'string',
+							default: 'Approve',
+							displayOptions: {
+								show: {
+									approvalType: ['single', 'double'],
+								},
+							},
+						},
+						{
+							...buttonStyle,
+							displayName: 'Approve Button Style',
+							name: 'buttonApprovalStyle',
+							displayOptions: {
+								show: {
+									approvalType: ['single', 'double'],
+								},
+							},
+						},
+						{
+							displayName: 'Disapprove Button Label',
+							name: 'disapproveLabel',
+							type: 'string',
+							default: 'Decline',
+							displayOptions: {
+								show: {
+									approvalType: ['double'],
+								},
+							},
+						},
+						{
+							...buttonStyle,
+							displayName: 'Disapprove Button Style',
+							name: 'buttonDisapprovalStyle',
+							default: 'secondary',
+							displayOptions: {
+								show: {
+									approvalType: ['double'],
+								},
+							},
+						},
+					],
+				},
+			],
+		},
+		...additionalProperties,
+		{
+			displayName:
+				'Use the wait node for more complex approval flows. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.wait" target="_blank">More info</a>',
+			name: 'useWaitNotice',
+			type: 'notice',
+			default: '',
+		},
+	];
+
+	return updateDisplayOptions(
+		{
+			show: {
+				resource: [resource],
+				operation: [SEND_AND_WAIT_OPERATION],
+			},
+		},
+		sendAndWait,
+	);
+}
+
+// Webhook Function --------------------------------------------------------------
+export async function sendAndWaitWebhook(this: IWebhookFunctions) {
+	const query = this.getRequestObject().query as { approved: 'false' | 'true' };
+	const approved = query.approved === 'true';
+	return {
+		webhookResponse: ACTION_RECORDED_PAGE,
+		workflowData: [[{ json: { data: { approved } } }]],
+	};
+}
+
+// Send and Wait Config -----------------------------------------------------------
+export function getSendAndWaitConfig(context: IExecuteFunctions): SendAndWaitConfig {
+	const message = escapeHtml((context.getNodeParameter('message', 0, '') as string).trim());
+	const subject = escapeHtml(context.getNodeParameter('subject', 0, '') as string);
+	const resumeUrl = context.evaluateExpression('{{ $execution?.resumeUrl }}', 0) as string;
+	const nodeId = context.evaluateExpression('{{ $nodeId }}', 0) as string;
+	const approvalOptions = context.getNodeParameter('approvalOptions.values', 0, {}) as {
+		approvalType?: 'single' | 'double';
+		approveLabel?: string;
+		buttonApprovalStyle?: string;
+		disapproveLabel?: string;
+		buttonDisapprovalStyle?: string;
+	};
+
+	const config: SendAndWaitConfig = {
+		title: subject,
+		message,
+		url: `${resumeUrl}/${nodeId}`,
+		options: [],
+	};
+
+	if (approvalOptions.approvalType === 'double') {
+		const approveLabel = escapeHtml(approvalOptions.approveLabel || 'Approve');
+		const buttonApprovalStyle = approvalOptions.buttonApprovalStyle || 'primary';
+		const disapproveLabel = escapeHtml(approvalOptions.disapproveLabel || 'Disapprove');
+		const buttonDisapprovalStyle = approvalOptions.buttonDisapprovalStyle || 'secondary';
+
+		config.options.push({
+			label: disapproveLabel,
+			value: 'false',
+			style: buttonDisapprovalStyle,
+		});
+		config.options.push({
+			label: approveLabel,
+			value: 'true',
+			style: buttonApprovalStyle,
+		});
+	} else {
+		const label = escapeHtml(approvalOptions.approveLabel || 'Approve');
+		const style = approvalOptions.buttonApprovalStyle || 'primary';
+		config.options.push({
+			label,
+			value: 'true',
+			style,
+		});
+	}
+
+	return config;
+}
+
+function createButton(url: string, label: string, approved: string, style: string) {
+	let buttonStyle = BUTTON_STYLE_PRIMARY;
+	if (style === 'secondary') {
+		buttonStyle = BUTTON_STYLE_SECONDARY;
+	}
+	return `<a href="${url}?approved=${approved}" target="_blank" style="${buttonStyle}">${label}</a>`;
+}
+
+export function createEmail(context: IExecuteFunctions) {
+	const to = (context.getNodeParameter('sendTo', 0, '') as string).trim();
+	const config = getSendAndWaitConfig(context);
+
+	if (to.indexOf('@') === -1 || (to.match(/@/g) || []).length > 1) {
+		const description = `The email address '${to}' in the 'To' field isn't valid or contains multiple addresses. Please provide only a single email address.`;
+		throw new NodeOperationError(context.getNode(), 'Invalid email address', {
+			description,
+			itemIndex: 0,
+		});
+	}
+
+	const buttons: string[] = [];
+	for (const option of config.options) {
+		buttons.push(createButton(config.url, option.label, option.value, option.style));
+	}
+
+	const instanceId = context.getInstanceId();
+
+	const email: IEmail = {
+		to,
+		subject: `${MESSAGE_PREFIX}${config.title}`,
+		body: '',
+		htmlBody: createEmailBody(config.message, buttons.join('\n'), instanceId),
+	};
+
+	return email;
+}
diff --git a/packages/nodes-base/utils/utilities.ts b/packages/nodes-base/utils/utilities.ts
index 54949d87c3..5c0b7f9d2b 100644
--- a/packages/nodes-base/utils/utilities.ts
+++ b/packages/nodes-base/utils/utilities.ts
@@ -404,3 +404,28 @@ export const sanitizeDataPathKey = (item: IDataObject, key: string) => {
 	}
 	return key;
 };
+
+/**
+ * Escape HTML
+ *
+ * @param {string} text The text to escape
+ */
+export function escapeHtml(text: string): string {
+	if (!text) return '';
+	return text.replace(/&amp;|&lt;|&gt;|&#39;|&quot;/g, (match) => {
+		switch (match) {
+			case '&amp;':
+				return '&';
+			case '&lt;':
+				return '<';
+			case '&gt;':
+				return '>';
+			case '&#39;':
+				return "'";
+			case '&quot;':
+				return '"';
+			default:
+				return match;
+		}
+	});
+}
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 06fb7acccb..e16d5c6579 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.60.0",
+  "version": "1.62.0",
   "description": "Workflow base code of n8n",
   "main": "dist/index.js",
   "module": "src/index.ts",
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index 95123c9793..b9b435be4f 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -38,6 +38,9 @@ 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 FORM_TRIGGER_NODE_TYPE = 'n8n-nodes-base.formTrigger';
+export const CHAT_TRIGGER_NODE_TYPE = '@n8n/n8n-nodes-langchain.chatTrigger';
+export const WAIT_NODE_TYPE = 'n8n-nodes-base.wait';
 
 export const STARTING_NODE_TYPES = [
 	MANUAL_TRIGGER_NODE_TYPE,
@@ -109,3 +112,5 @@ export const SINGLE_EXECUTION_NODES: { [key: string]: { [key: string]: NodeParam
 		operation: [undefined], // default info
 	},
 };
+
+export const SEND_AND_WAIT_OPERATION = 'sendAndWait';
diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts
index 8a6d568d24..7d715d08b5 100644
--- a/packages/workflow/src/ErrorReporterProxy.ts
+++ b/packages/workflow/src/ErrorReporterProxy.ts
@@ -5,17 +5,13 @@ 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;
-				if (inDevelopment) console.log(e, meta);
-				else Logger.error(`${e.constructor.name}: ${e.message}`, meta);
+				Logger.error(`${e.constructor.name}: ${e.message}`, meta);
 				e = e.cause as Error;
 			} while (e);
 		}
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 0d56f79009..41a272e47a 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -21,7 +21,9 @@ import type { NodeOperationError } from './errors/node-operation.error';
 import type { WorkflowActivationError } from './errors/workflow-activation.error';
 import type { WorkflowOperationError } from './errors/workflow-operation.error';
 import type { ExecutionStatus } from './ExecutionStatus';
+import type { Result } from './result';
 import type { Workflow } from './Workflow';
+import type { EnvProviderState } from './WorkflowDataProxyEnvProvider';
 import type { WorkflowHooks } from './WorkflowHooks';
 
 export interface IAdditionalCredentialOptions {
@@ -314,6 +316,7 @@ export interface ICredentialType {
 	name: string;
 	displayName: string;
 	icon?: Icon;
+	iconColor?: ThemeIconColor;
 	iconUrl?: Themed<string>;
 	extends?: string[];
 	properties: INodeProperties[];
@@ -327,6 +330,7 @@ export interface ICredentialType {
 	test?: ICredentialTestRequest;
 	genericAuth?: boolean;
 	httpRequestNode?: ICredentialHttpRequestNode;
+	supportedNodes?: string[];
 }
 
 export interface ICredentialTypes {
@@ -763,6 +767,48 @@ export interface BinaryHelperFunctions {
 	}>;
 }
 
+export type DeduplicationScope = 'node' | 'workflow';
+export type DeduplicationItemTypes = string | number;
+export type DeduplicationMode = 'entries' | 'latestIncrementalKey' | 'latestDate';
+
+export interface IDeduplicationOutput {
+	new: DeduplicationItemTypes[];
+	processed: DeduplicationItemTypes[];
+}
+
+export interface IDeduplicationOutputItems {
+	new: IDataObject[];
+	processed: IDataObject[];
+}
+
+export interface ICheckProcessedOptions {
+	mode: DeduplicationMode;
+	maxEntries?: number;
+}
+
+export interface DeduplicationHelperFunctions {
+	checkProcessedAndRecord(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutput>;
+	checkProcessedItemsAndRecord(
+		propertyName: string,
+		items: IDataObject[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutputItems>;
+	removeProcessed(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<void>;
+	clearAllProcessedItems(scope: DeduplicationScope, options: ICheckProcessedOptions): Promise<void>;
+	getProcessedDataCount(
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<number>;
+}
 export interface NodeHelperFunctions {
 	copyBinaryFile(filePath: string, fileName: string, mimeType?: string): Promise<IBinaryData>;
 }
@@ -936,6 +982,7 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 		helpers: RequestHelperFunctions &
 			BaseHelperFunctions &
 			BinaryHelperFunctions &
+			DeduplicationHelperFunctions &
 			FileSystemHelperFunctions &
 			SSHTunnelFunctions &
 			JsonHelperFunctions & {
@@ -950,6 +997,12 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 			};
 
 		getParentCallbackManager(): CallbackManager | undefined;
+
+		startJob<T = unknown, E = unknown>(
+			jobType: string,
+			settings: unknown,
+			itemIndex: number,
+		): Promise<Result<T, E>>;
 	};
 
 export interface IExecuteSingleFunctions extends BaseExecutionFunctions {
@@ -1617,7 +1670,7 @@ export interface IWorkflowIssues {
 	[key: string]: INodeIssues;
 }
 
-export type NodeIconColor =
+export type ThemeIconColor =
 	| 'gray'
 	| 'black'
 	| 'blue'
@@ -1642,7 +1695,7 @@ export interface INodeTypeBaseDescription {
 	displayName: string;
 	name: string;
 	icon?: Icon;
-	iconColor?: NodeIconColor;
+	iconColor?: ThemeIconColor;
 	iconUrl?: Themed<string>;
 	badgeIconUrl?: Themed<string>;
 	group: string[];
@@ -2120,6 +2173,7 @@ export interface IWorkflowBase {
 	name: string;
 	active: boolean;
 	createdAt: Date;
+	startedAt?: Date;
 	updatedAt: Date;
 	nodes: INode[];
 	connections: IConnections;
@@ -2236,6 +2290,27 @@ export interface IWorkflowExecuteAdditionalData {
 	secretsHelpers: SecretsHelpersBase;
 	logAiEvent: (eventName: AiEvent, payload: AiEventPayload) => void;
 	parentCallbackManager?: CallbackManager;
+	startAgentJob<T, E = unknown>(
+		additionalData: IWorkflowExecuteAdditionalData,
+		jobType: string,
+		settings: unknown,
+		executeFunctions: IExecuteFunctions,
+		inputData: ITaskDataConnections,
+		node: INode,
+		workflow: Workflow,
+		runExecutionData: IRunExecutionData,
+		runIndex: number,
+		itemIndex: number,
+		activeNodeName: string,
+		connectionInputData: INodeExecutionData[],
+		siblingParameters: INodeParameters,
+		mode: WorkflowExecuteMode,
+		envProviderState: EnvProviderState,
+		executeData?: IExecuteData,
+		defaultReturnRunIndex?: number,
+		selfData?: IDataObject,
+		contextNodeName?: string,
+	): Promise<Result<T, E>>;
 }
 
 export type WorkflowExecuteMode =
@@ -2461,6 +2536,7 @@ export interface ExecutionSummary {
 	retryOf?: string | null;
 	retrySuccessId?: string | null;
 	waitTill?: Date;
+	createdAt?: Date;
 	startedAt: Date;
 	stoppedAt?: Date;
 	workflowId: string;
@@ -2617,6 +2693,46 @@ export interface IUserSettings {
 	npsSurvey?: NpsSurveyState;
 }
 
+export interface IProcessedDataConfig {
+	availableModes: string;
+	mode: string;
+}
+
+export interface IDataDeduplicator {
+	checkProcessedAndRecord(
+		items: DeduplicationItemTypes[],
+		context: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutput>;
+
+	removeProcessed(
+		items: DeduplicationItemTypes[],
+		context: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<void>;
+
+	clearAllProcessedItems(
+		context: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<void>;
+	getProcessedDataCount(
+		context: DeduplicationScope,
+		contextData: ICheckProcessedContextData,
+		options: ICheckProcessedOptions,
+	): Promise<number>;
+}
+
+export interface ICheckProcessedContextData {
+	node?: INode;
+	workflow: {
+		id: string;
+		active: boolean;
+	};
+}
+
 export type ExpressionEvaluatorType = 'tmpl' | 'tournament';
 
 export type N8nAIProviderType = 'openai' | 'unknown';
@@ -2641,8 +2757,6 @@ export type BannerName =
 
 export type Functionality = 'regular' | 'configuration-node' | 'pairedItem';
 
-export type Result<T, E> = { ok: true; result: T } | { ok: false; error: E };
-
 export type CallbackManager = CallbackManagerLC;
 
 export type IPersonalizationSurveyAnswersV4 = {
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 6869652f4f..85431c6897 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -259,7 +259,7 @@ const commonPollingParameters: INodeProperties[] = [
 	},
 ];
 
-const commonCORSParameters: INodeProperties[] = [
+export const commonCORSParameters: INodeProperties[] = [
 	{
 		displayName: 'Allowed Origins (CORS)',
 		name: 'allowedOrigins',
@@ -359,7 +359,7 @@ const declarativeNodeOptionParameters: INodeProperties = {
 export function convertNodeToAiTool<
 	T extends object & { description: INodeTypeDescription | INodeTypeBaseDescription },
 >(item: T): T {
-	// quick helper function for typeguard down below
+	// quick helper function for type-guard down below
 	function isFullDescription(obj: unknown): obj is INodeTypeDescription {
 		return typeof obj === 'object' && obj !== null && 'properties' in obj;
 	}
@@ -368,9 +368,33 @@ export function convertNodeToAiTool<
 		item.description.name += 'Tool';
 		item.description.inputs = [];
 		item.description.outputs = [NodeConnectionType.AiTool];
-		item.description.displayName += ' Tool (wrapped)';
+		item.description.displayName += ' Tool';
 		delete item.description.usableAsTool;
+
+		const hasResource = item.description.properties.some((prop) => prop.name === 'resource');
+		const hasOperation = item.description.properties.some((prop) => prop.name === 'operation');
+
 		if (!item.description.properties.map((prop) => prop.name).includes('toolDescription')) {
+			const descriptionType: INodeProperties = {
+				displayName: 'Tool Description',
+				name: 'descriptionType',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Set Automatically',
+						value: 'auto',
+						description: 'Automatically set based on resource and operation',
+					},
+					{
+						name: 'Set Manually',
+						value: 'manual',
+						description: 'Manually set the description',
+					},
+				],
+				default: 'auto',
+			};
+
 			const descProp: INodeProperties = {
 				displayName: 'Description',
 				name: 'toolDescription',
@@ -382,7 +406,29 @@ export function convertNodeToAiTool<
 					'Explain to the LLM what this tool does, a good, specific description would allow LLMs to produce expected results much more often',
 				placeholder: `e.g. ${item.description.description}`,
 			};
+
+			const noticeProp: INodeProperties = {
+				displayName: 'Use the expression {{ $fromAI() }} for any data to be filled by the model',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			};
+
 			item.description.properties.unshift(descProp);
+
+			// If node has resource or operation we can determine pre-populate tool description based on it
+			// so we add the descriptionType property as the first property
+			if (hasResource || hasOperation) {
+				item.description.properties.unshift(descriptionType);
+
+				descProp.displayOptions = {
+					show: {
+						descriptionType: ['manual'],
+					},
+				};
+			}
+
+			item.description.properties.unshift(noticeProp);
 		}
 	}
 
diff --git a/packages/workflow/src/NodeParameters/FilterParameter.ts b/packages/workflow/src/NodeParameters/FilterParameter.ts
index b2df097b09..88bc80f3ec 100644
--- a/packages/workflow/src/NodeParameters/FilterParameter.ts
+++ b/packages/workflow/src/NodeParameters/FilterParameter.ts
@@ -7,10 +7,10 @@ import type {
 	FilterOptionsValue,
 	FilterValue,
 	INodeProperties,
-	Result,
 	ValidationResult,
 } from '../Interfaces';
 import * as LoggerProxy from '../LoggerProxy';
+import type { Result } from '../result';
 import { validateFieldType } from '../TypeValidation';
 
 type FilterConditionMetadata = {
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index 1ceb62fb7b..c596076845 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -30,6 +30,8 @@ import {
 import * as NodeHelpers from './NodeHelpers';
 import { deepCopy } from './utils';
 import type { Workflow } from './Workflow';
+import type { EnvProviderState } from './WorkflowDataProxyEnvProvider';
+import { createEnvProvider, createEnvProviderState } from './WorkflowDataProxyEnvProvider';
 import { getPinDataIfManualExecution } from './WorkflowDataProxyHelpers';
 
 export function isResourceLocatorValue(value: unknown): value is INodeParameterResourceLocator {
@@ -66,6 +68,7 @@ export class WorkflowDataProxy {
 		private defaultReturnRunIndex = -1,
 		private selfData: IDataObject = {},
 		private contextNodeName: string = activeNodeName,
+		private envProviderState?: EnvProviderState,
 	) {
 		this.runExecutionData = isScriptingNode(this.contextNodeName, workflow)
 			? runExecutionData !== null
@@ -487,40 +490,6 @@ export class WorkflowDataProxy {
 		);
 	}
 
-	/**
-	 * Returns a proxy to query data from the environment
-	 *
-	 * @private
-	 */
-	private envGetter() {
-		const that = this;
-		return new Proxy(
-			{},
-			{
-				has: () => true,
-				get(_, name) {
-					if (name === 'isProxy') return true;
-
-					if (typeof process === 'undefined') {
-						throw new ExpressionError('not accessible via UI, please run node', {
-							runIndex: that.runIndex,
-							itemIndex: that.itemIndex,
-						});
-					}
-					if (process.env.N8N_BLOCK_ENV_ACCESS_IN_NODE === 'true') {
-						throw new ExpressionError('access to env vars denied', {
-							causeDetailed:
-								'If you need access please contact the administrator to remove the environment variable ‘N8N_BLOCK_ENV_ACCESS_IN_NODE‘',
-							runIndex: that.runIndex,
-							itemIndex: that.itemIndex,
-						});
-					}
-					return process.env[name.toString()];
-				},
-			},
-		);
-	}
-
 	private prevNodeGetter() {
 		const allowedValues = ['name', 'outputIndex', 'runIndex'];
 		const that = this;
@@ -961,6 +930,43 @@ export class WorkflowDataProxy {
 			return taskData.data!.main[previousNodeOutput]![pairedItem.item];
 		};
 
+		const handleFromAi = (
+			name: string,
+			_description?: string,
+			_type: string = 'string',
+			defaultValue?: unknown,
+		) => {
+			if (!name || name === '') {
+				throw new ExpressionError('Please provide a key', {
+					runIndex: that.runIndex,
+					itemIndex: that.itemIndex,
+				});
+			}
+			const nameValidationRegex = /^[a-zA-Z0-9_-]{0,64}$/;
+			if (!nameValidationRegex.test(name)) {
+				throw new ExpressionError(
+					'Invalid parameter key, must be between 1 and 64 characters long and only contain lowercase letters, uppercase letters, numbers, underscores, and hyphens',
+					{
+						runIndex: that.runIndex,
+						itemIndex: that.itemIndex,
+					},
+				);
+			}
+			const placeholdersDataInputData =
+				that.runExecutionData?.resultData.runData[that.activeNodeName]?.[0].inputOverride?.[
+					NodeConnectionType.AiTool
+				]?.[0]?.[0].json;
+
+			if (Boolean(!placeholdersDataInputData)) {
+				throw new ExpressionError('No execution data available', {
+					runIndex: that.runIndex,
+					itemIndex: that.itemIndex,
+					type: 'no_execution_data',
+				});
+			}
+			return placeholdersDataInputData?.[name] ?? defaultValue;
+		};
+
 		const base = {
 			$: (nodeName: string) => {
 				if (!nodeName) {
@@ -1266,7 +1272,11 @@ export class WorkflowDataProxy {
 
 			$binary: {}, // Placeholder
 			$data: {}, // Placeholder
-			$env: this.envGetter(),
+			$env: createEnvProvider(
+				that.runIndex,
+				that.itemIndex,
+				that.envProviderState ?? createEnvProviderState(),
+			),
 			$evaluateExpression: (expression: string, itemIndex?: number) => {
 				itemIndex = itemIndex || that.itemIndex;
 				return that.workflow.expression.getParameterValue(
@@ -1303,6 +1313,10 @@ export class WorkflowDataProxy {
 				);
 				return dataProxy.getDataProxy();
 			},
+			$fromAI: handleFromAi,
+			// Make sure mis-capitalized $fromAI is handled correctly even though we don't auto-complete it
+			$fromai: handleFromAi,
+			$fromAi: handleFromAi,
 			$items: (nodeName?: string, outputIndex?: number, runIndex?: number) => {
 				if (nodeName === undefined) {
 					nodeName = (that.prevNodeGetter() as { name: string }).name;
@@ -1350,6 +1364,7 @@ export class WorkflowDataProxy {
 			$thisItemIndex: this.itemIndex,
 			$thisRunIndex: this.runIndex,
 			$nodeVersion: that.workflow.getNode(that.activeNodeName)?.typeVersion,
+			$nodeId: that.workflow.getNode(that.activeNodeName)?.id,
 		};
 
 		return new Proxy(base, {
diff --git a/packages/workflow/src/WorkflowDataProxyEnvProvider.ts b/packages/workflow/src/WorkflowDataProxyEnvProvider.ts
new file mode 100644
index 0000000000..b41c8b8e09
--- /dev/null
+++ b/packages/workflow/src/WorkflowDataProxyEnvProvider.ts
@@ -0,0 +1,75 @@
+import { ExpressionError } from './errors/expression.error';
+
+export type EnvProviderState = {
+	isProcessAvailable: boolean;
+	isEnvAccessBlocked: boolean;
+	env: Record<string, string>;
+};
+
+/**
+ * Captures a snapshot of the environment variables and configuration
+ * that can be used to initialize an environment provider.
+ */
+export function createEnvProviderState(): EnvProviderState {
+	const isProcessAvailable = typeof process !== 'undefined';
+	const isEnvAccessBlocked = isProcessAvailable
+		? process.env.N8N_BLOCK_ENV_ACCESS_IN_NODE === 'true'
+		: false;
+	const env: Record<string, string> =
+		!isProcessAvailable || isEnvAccessBlocked ? {} : (process.env as Record<string, string>);
+
+	return {
+		isProcessAvailable,
+		isEnvAccessBlocked,
+		env,
+	};
+}
+
+/**
+ * Creates a proxy that provides access to the environment variables
+ * in the `WorkflowDataProxy`. Use the `createEnvProviderState` to
+ * create the default state object that is needed for the proxy,
+ * unless you need something specific.
+ *
+ * @example
+ * createEnvProvider(
+ *   runIndex,
+ *   itemIndex,
+ *   createEnvProviderState(),
+ * )
+ */
+export function createEnvProvider(
+	runIndex: number,
+	itemIndex: number,
+	providerState: EnvProviderState,
+): Record<string, string> {
+	return new Proxy(
+		{},
+		{
+			has() {
+				return true;
+			},
+
+			get(_, name) {
+				if (name === 'isProxy') return true;
+
+				if (!providerState.isProcessAvailable) {
+					throw new ExpressionError('not accessible via UI, please run node', {
+						runIndex,
+						itemIndex,
+					});
+				}
+				if (providerState.isEnvAccessBlocked) {
+					throw new ExpressionError('access to env vars denied', {
+						causeDetailed:
+							'If you need access please contact the administrator to remove the environment variable ‘N8N_BLOCK_ENV_ACCESS_IN_NODE‘',
+						runIndex,
+						itemIndex,
+					});
+				}
+
+				return providerState.env[name.toString()];
+			},
+		},
+	);
+}
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 61dae7afae..8c304664f1 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -18,9 +18,11 @@ export * from './NodeHelpers';
 export * from './RoutingNode';
 export * from './Workflow';
 export * from './WorkflowDataProxy';
+export * from './WorkflowDataProxyEnvProvider';
 export * from './WorkflowHooks';
 export * from './VersionedNodeType';
 export * from './TypeValidation';
+export * from './result';
 export { LoggerProxy, NodeHelpers, ObservableObject, TelemetryHelpers };
 export {
 	isObjectEmpty,
diff --git a/packages/workflow/src/result.ts b/packages/workflow/src/result.ts
new file mode 100644
index 0000000000..3ee3c18fb7
--- /dev/null
+++ b/packages/workflow/src/result.ts
@@ -0,0 +1,13 @@
+export type ResultOk<T> = { ok: true; result: T };
+export type ResultError<E> = { ok: false; error: E };
+export type Result<T, E> = ResultOk<T> | ResultError<E>;
+
+export const createResultOk = <T>(data: T): ResultOk<T> => ({
+	ok: true,
+	result: data,
+});
+
+export const createResultError = <E = unknown>(error: E): ResultError<E> => ({
+	ok: false,
+	error,
+});
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index f3ecc161ca..81b7af5de6 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -3660,7 +3660,7 @@ describe('NodeHelpers', () => {
 		it('should modify the name and displayName correctly', () => {
 			const result = convertNodeToAiTool(fullNodeWrapper);
 			expect(result.description.name).toBe('testNodeTool');
-			expect(result.description.displayName).toBe('Test Node Tool (wrapped)');
+			expect(result.description.displayName).toBe('Test Node Tool');
 		});
 
 		it('should update inputs and outputs', () => {
@@ -3685,19 +3685,6 @@ describe('NodeHelpers', () => {
 			expect(toolDescriptionProp?.default).toBe(fullNodeWrapper.description.description);
 		});
 
-		it('should not add toolDescription property if it already exists', () => {
-			const toolDescriptionProp: INodeProperties = {
-				displayName: 'Tool Description',
-				name: 'toolDescription',
-				type: 'string',
-				default: 'Existing description',
-			};
-			fullNodeWrapper.description.properties = [toolDescriptionProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties).toHaveLength(1);
-			expect(result.description.properties[0]).toEqual(toolDescriptionProp);
-		});
-
 		it('should set codex categories correctly', () => {
 			const result = convertNodeToAiTool(fullNodeWrapper);
 			expect(result.description.codex).toEqual({
@@ -3718,8 +3705,102 @@ describe('NodeHelpers', () => {
 			};
 			fullNodeWrapper.description.properties = [existingProp];
 			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties).toHaveLength(2); // Existing prop + toolDescription
+			expect(result.description.properties).toHaveLength(3); // Existing prop + toolDescription + notice
 			expect(result.description.properties).toContainEqual(existingProp);
 		});
+
+		it('should handle nodes with resource property', () => {
+			const resourceProp: INodeProperties = {
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [{ name: 'User', value: 'user' }],
+				default: 'user',
+			};
+			fullNodeWrapper.description.properties = [resourceProp];
+			const result = convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(resourceProp);
+		});
+
+		it('should handle nodes with operation property', () => {
+			const operationProp: INodeProperties = {
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [{ name: 'Create', value: 'create' }],
+				default: 'create',
+			};
+			fullNodeWrapper.description.properties = [operationProp];
+			const result = convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(operationProp);
+		});
+
+		it('should handle nodes with both resource and operation properties', () => {
+			const resourceProp: INodeProperties = {
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [{ name: 'User', value: 'user' }],
+				default: 'user',
+			};
+			const operationProp: INodeProperties = {
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [{ name: 'Create', value: 'create' }],
+				default: 'create',
+			};
+			fullNodeWrapper.description.properties = [resourceProp, operationProp];
+			const result = convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(resourceProp);
+			expect(result.description.properties[4]).toEqual(operationProp);
+		});
+
+		it('should handle nodes with empty properties', () => {
+			fullNodeWrapper.description.properties = [];
+			const result = convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties).toHaveLength(2);
+			expect(result.description.properties[1].name).toBe('toolDescription');
+		});
+
+		it('should handle nodes with existing codex property', () => {
+			fullNodeWrapper.description.codex = {
+				categories: ['Existing'],
+				subcategories: {
+					Existing: ['Category'],
+				},
+			};
+			const result = convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.codex).toEqual({
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Tools'],
+					Tools: ['Other Tools'],
+				},
+			});
+		});
+
+		it('should handle nodes with very long names', () => {
+			fullNodeWrapper.description.name = 'veryLongNodeNameThatExceedsNormalLimits'.repeat(10);
+			fullNodeWrapper.description.displayName =
+				'Very Long Node Name That Exceeds Normal Limits'.repeat(10);
+			const result = convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.name.endsWith('Tool')).toBe(true);
+			expect(result.description.displayName.endsWith('Tool')).toBe(true);
+		});
+
+		it('should handle nodes with special characters in name and displayName', () => {
+			fullNodeWrapper.description.name = 'special@#$%Node';
+			fullNodeWrapper.description.displayName = 'Special @#$% Node';
+			const result = convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.name).toBe('special@#$%NodeTool');
+			expect(result.description.displayName).toBe('Special @#$% Node Tool');
+		});
 	});
 });
diff --git a/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts b/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts
new file mode 100644
index 0000000000..15ce485140
--- /dev/null
+++ b/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts
@@ -0,0 +1,87 @@
+import { ExpressionError } from '../src/errors/expression.error';
+import { createEnvProvider, createEnvProviderState } from '../src/WorkflowDataProxyEnvProvider';
+
+describe('createEnvProviderState', () => {
+	afterEach(() => {
+		delete process.env.N8N_BLOCK_ENV_ACCESS_IN_NODE;
+	});
+
+	it('should return the state with process available and env access allowed', () => {
+		expect(createEnvProviderState()).toEqual({
+			isProcessAvailable: true,
+			isEnvAccessBlocked: false,
+			env: process.env,
+		});
+	});
+
+	it('should block env access when N8N_BLOCK_ENV_ACCESS_IN_NODE is set to "true"', () => {
+		process.env.N8N_BLOCK_ENV_ACCESS_IN_NODE = 'true';
+
+		expect(createEnvProviderState()).toEqual({
+			isProcessAvailable: true,
+			isEnvAccessBlocked: true,
+			env: {},
+		});
+	});
+
+	it('should handle process not being available', () => {
+		const originalProcess = global.process;
+		try {
+			// @ts-expect-error process is read-only
+			global.process = undefined;
+
+			expect(createEnvProviderState()).toEqual({
+				isProcessAvailable: false,
+				isEnvAccessBlocked: false,
+				env: {},
+			});
+		} finally {
+			global.process = originalProcess;
+		}
+	});
+});
+
+describe('createEnvProvider', () => {
+	it('should return true when checking for a property using "has"', () => {
+		const proxy = createEnvProvider(0, 0, createEnvProviderState());
+		expect('someProperty' in proxy).toBe(true);
+	});
+
+	it('should return the value from process.env if access is allowed', () => {
+		process.env.TEST_ENV_VAR = 'test_value';
+		const proxy = createEnvProvider(0, 0, createEnvProviderState());
+		expect(proxy.TEST_ENV_VAR).toBe('test_value');
+	});
+
+	it('should throw ExpressionError when process is unavailable', () => {
+		const originalProcess = global.process;
+		// @ts-expect-error process is read-only
+		global.process = undefined;
+		try {
+			const proxy = createEnvProvider(1, 1, createEnvProviderState());
+
+			expect(() => proxy.someEnvVar).toThrowError(
+				new ExpressionError('not accessible via UI, please run node', {
+					runIndex: 1,
+					itemIndex: 1,
+				}),
+			);
+		} finally {
+			global.process = originalProcess;
+		}
+	});
+
+	it('should throw ExpressionError when env access is blocked', () => {
+		process.env.N8N_BLOCK_ENV_ACCESS_IN_NODE = 'true';
+		const proxy = createEnvProvider(1, 1, createEnvProviderState());
+
+		expect(() => proxy.someEnvVar).toThrowError(
+			new ExpressionError('access to env vars denied', {
+				causeDetailed:
+					'If you need access please contact the administrator to remove the environment variable ‘N8N_BLOCK_ENV_ACCESS_IN_NODE‘',
+				runIndex: 1,
+				itemIndex: 1,
+			}),
+		);
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 37deecfef7..0dca3aee05 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -61,44 +61,45 @@ catalogs:
       specifier: 3.23.8
       version: 3.23.8
   frontend:
+    '@sentry/vue':
+      specifier: ^8.33.1
+      version: 8.33.1
     '@vitest/coverage-v8':
-      specifier: ^2.0.5
-      version: 2.1.1
+      specifier: ^2.1.2
+      version: 2.1.2
     highlight.js:
       specifier: ^11.8.0
       version: 11.9.0
     vite:
-      specifier: ^5.4.6
-      version: 5.4.6
+      specifier: ^5.4.8
+      version: 5.4.8
     vitest:
-      specifier: ^2.1.1
-      version: 2.1.1
+      specifier: ^2.1.2
+      version: 2.1.2
     vitest-mock-extended:
       specifier: ^2.0.2
       version: 2.0.2
     vue:
-      specifier: ^3.4.21
-      version: 3.4.21
+      specifier: ^3.5.11
+      version: 3.5.11
     vue-markdown-render:
       specifier: ^2.2.1
       version: 2.2.1
     vue-router:
-      specifier: ^4.4.2
-      version: 4.4.2
-    vue-tsc:
-      specifier: ^2.0.19
-      version: 2.0.19
+      specifier: ^4.4.5
+      version: 4.4.5
 
 overrides:
   '@types/node': ^18.16.16
-  chokidar: 3.5.2
-  esbuild: ^0.20.2
+  chokidar: ^4.0.1
+  esbuild: ^0.24.0
   formidable: 3.5.1
   pug: ^3.0.3
   semver: ^7.5.4
   tslib: ^2.6.2
   tsconfig-paths: ^4.2.0
   typescript: ^5.6.2
+  vue-tsc: ^2.1.6
   ws: '>=8.17.1'
 
 patchedDependencies:
@@ -186,8 +187,8 @@ importers:
         specifier: ^6.0.4
         version: 6.0.4(typescript@5.6.2)
       turbo:
-        specifier: 2.0.6
-        version: 2.0.6
+        specifier: 2.1.2
+        version: 2.1.2
       typescript:
         specifier: ^5.6.2
         version: 5.6.2
@@ -289,7 +290,7 @@ importers:
     dependencies:
       '@vueuse/core':
         specifier: ^10.11.0
-        version: 10.11.0(vue@3.4.21(typescript@5.6.2))
+        version: 10.11.0(vue@3.5.11(typescript@5.6.2))
       highlight.js:
         specifier: catalog:frontend
         version: 11.9.0
@@ -301,10 +302,10 @@ importers:
         version: 10.0.0
       vue:
         specifier: catalog:frontend
-        version: 3.4.21(typescript@5.6.2)
+        version: 3.5.11(typescript@5.6.2)
       vue-markdown-render:
         specifier: catalog:frontend
-        version: 2.2.1(vue@3.4.21(typescript@5.6.2))
+        version: 2.2.1(vue@3.5.11(typescript@5.6.2))
     devDependencies:
       '@iconify-json/mdi':
         specifier: ^1.1.54
@@ -314,22 +315,22 @@ importers:
         version: link:../storybook
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.1(vitest@2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.1.2(vitest@2.1.2(@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)
+        version: 0.19.0(@vue/compiler-sfc@3.5.11)
       vite:
         specifier: catalog:frontend
-        version: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+        version: 5.4.8(@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.22.2)(typescript@5.6.2)(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
+        specifier: ^4.2.3
+        version: 4.2.3(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.6.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
       vitest:
         specifier: catalog:frontend
-        version: 2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 2.1.2(@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.6.2)
+        specifier: ^2.1.6
+        version: 2.1.6(typescript@5.6.2)
 
   packages/@n8n/client-oauth2:
     dependencies:
@@ -395,9 +396,12 @@ importers:
 
   packages/@n8n/nodes-langchain:
     dependencies:
+      '@aws-sdk/client-sso-oidc':
+        specifier: 3.666.0
+        version: 3.666.0(@aws-sdk/client-sts@3.666.0)
       '@getzep/zep-cloud':
-        specifier: 1.0.11
-        version: 1.0.11(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(jteet444uhz3pk3ib4eb2yc7pm))
+        specifier: 1.0.12
+        version: 1.0.12(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(u4cmnaniapk3e37ytin75vjstm))
       '@getzep/zep-js':
         specifier: 0.9.0
         version: 0.9.0
@@ -417,14 +421,14 @@ importers:
         specifier: 0.3.1
         version: 0.3.1(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/aws':
-        specifier: ^0.1.0
-        version: 0.1.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
+        specifier: 0.1.0
+        version: 0.1.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
       '@langchain/cohere':
         specifier: 0.3.0
-        version: 0.3.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        version: 0.3.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/community':
         specifier: 0.3.2
-        version: 0.3.2(civqmlpli3jn6p47akgofyjajm)
+        version: 0.3.2(ybvsmgvmojutmcl4aem5hlk5te)
       '@langchain/core':
         specifier: 'catalog:'
         version: 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
@@ -459,11 +463,11 @@ importers:
         specifier: 0.1.0
         version: 0.1.0(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
       '@mozilla/readability':
-        specifier: ^0.5.0
+        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.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+        specifier: 0.3.20-12
+        version: 0.3.20-12(@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)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
       '@n8n/vm2':
         specifier: 3.9.25
         version: 3.9.25
@@ -476,21 +480,18 @@ importers:
       '@supabase/supabase-js':
         specifier: 2.45.4
         version: 2.45.4
-      '@types/pg':
-        specifier: ^8.11.6
-        version: 8.11.6
       '@xata.io/client':
-        specifier: 0.30.0
-        version: 0.30.0(typescript@5.6.2)
+        specifier: 0.28.4
+        version: 0.28.4(typescript@5.6.2)
       basic-auth:
         specifier: 'catalog:'
         version: 2.0.1
       cheerio:
-        specifier: 1.0.0-rc.12
-        version: 1.0.0-rc.12
+        specifier: 1.0.0
+        version: 1.0.0
       cohere-ai:
         specifier: 7.13.2
-        version: 7.13.2(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(encoding@0.1.13)
+        version: 7.13.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
       d3-dsv:
         specifier: 2.0.0
         version: 2.0.0
@@ -507,14 +508,14 @@ importers:
         specifier: 9.0.5
         version: 9.0.5
       jsdom:
-        specifier: ^23.0.1
+        specifier: 23.0.1
         version: 23.0.1
       json-schema-to-zod:
         specifier: 2.1.0
         version: 2.1.0
       langchain:
         specifier: 0.3.2
-        version: 0.3.2(jteet444uhz3pk3ib4eb2yc7pm)
+        version: 0.3.2(u4cmnaniapk3e37ytin75vjstm)
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
@@ -567,6 +568,9 @@ importers:
       '@types/json-schema':
         specifier: ^7.0.15
         version: 7.0.15
+      '@types/pg':
+        specifier: ^8.11.6
+        version: 8.11.6
       '@types/temp':
         specifier: ^0.9.1
         version: 0.9.4
@@ -582,44 +586,63 @@ importers:
         specifier: ^2.0.2
         version: 2.0.2(react@18.2.0)
       '@storybook/addon-a11y':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)
       '@storybook/addon-actions':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)
       '@storybook/addon-docs':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)
       '@storybook/addon-essentials':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)
       '@storybook/addon-interactions':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)
       '@storybook/addon-links':
-        specifier: ^8.3.1
-        version: 8.3.1(react@18.2.0)(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(react@18.2.0)(storybook@8.3.5)
       '@storybook/addon-themes':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)
       '@storybook/blocks':
-        specifier: ^8.3.1
-        version: 8.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)
       '@storybook/test':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)
       '@storybook/vue3':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)(vue@3.4.21(typescript@5.6.2))
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)(vue@3.5.11(typescript@5.6.2))
       '@storybook/vue3-vite':
-        specifier: ^8.3.1
-        version: 8.3.1(storybook@8.3.1)(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.4.21(typescript@5.6.2))
+        specifier: ^8.3.5
+        version: 8.3.5(storybook@8.3.5)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.5.11(typescript@5.6.2))
       chromatic:
         specifier: ^11.10.2
         version: 11.10.2
       storybook:
-        specifier: ^8.3.1
-        version: 8.3.1
+        specifier: ^8.3.5
+        version: 8.3.5
+
+  packages/@n8n/task-runner:
+    dependencies:
+      n8n-core:
+        specifier: workspace:*
+        version: link:../../core
+      n8n-workflow:
+        specifier: workspace:*
+        version: link:../../workflow
+      nanoid:
+        specifier: ^3.3.6
+        version: 3.3.7
+      ws:
+        specifier: '>=8.17.1'
+        version: 8.17.1
+    devDependencies:
+      luxon:
+        specifier: 'catalog:'
+        version: 3.4.4
 
   packages/@n8n_io/eslint-config:
     devDependencies:
@@ -698,12 +721,15 @@ importers:
       '@n8n/permissions':
         specifier: workspace:*
         version: link:../@n8n/permissions
+      '@n8n/task-runner':
+        specifier: workspace:*
+        version: link:../@n8n/task-runner
       '@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)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+        specifier: 0.3.20-12
+        version: 0.3.20-12(@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)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
       '@n8n_io/ai-assistant-sdk':
-        specifier: 1.9.4
-        version: 1.9.4
+        specifier: 1.10.3
+        version: 1.10.3
       '@n8n_io/license-sdk':
         specifier: 2.13.1
         version: 2.13.1
@@ -719,12 +745,6 @@ importers:
       '@sentry/node':
         specifier: 7.87.0
         version: 7.87.0
-      '@types/tar-stream':
-        specifier: ^3.1.3
-        version: 3.1.3
-      archiver:
-        specifier: 7.0.1
-        version: 7.0.1
       aws4:
         specifier: 1.11.0
         version: 1.11.0
@@ -759,35 +779,35 @@ importers:
         specifier: 6.2.4
         version: 6.2.4
       cookie-parser:
-        specifier: 1.4.6
-        version: 1.4.6
+        specifier: 1.4.7
+        version: 1.4.7
       csrf:
         specifier: 3.1.0
         version: 3.1.0
       curlconverter:
         specifier: 3.21.0
-        version: 3.21.0(chokidar@3.5.2)
+        version: 3.21.0(chokidar@4.0.1)
       dotenv:
         specifier: 8.6.0
         version: 8.6.0
       express:
-        specifier: 4.21.0
-        version: 4.21.0
+        specifier: 4.21.1
+        version: 4.21.1
       express-async-errors:
         specifier: 3.1.1
-        version: 3.1.1(express@4.21.0)
+        version: 3.1.1(express@4.21.1)
       express-handlebars:
         specifier: 7.1.2
         version: 7.1.2
       express-openapi-validator:
-        specifier: 5.3.3
-        version: 5.3.3(express@4.21.0)
+        specifier: 5.3.7
+        version: 5.3.7(express@4.21.1)
       express-prom-bundle:
         specifier: 6.6.0
         version: 6.6.0(prom-client@13.2.0)
       express-rate-limit:
         specifier: 7.2.0
-        version: 7.2.0(express@4.21.0)
+        version: 7.2.0(express@4.21.1)
       fast-glob:
         specifier: 'catalog:'
         version: 3.2.12
@@ -861,8 +881,8 @@ importers:
         specifier: 7.4.2
         version: 7.4.2
       openapi-types:
-        specifier: 10.0.0
-        version: 10.0.0
+        specifier: 12.1.3
+        version: 12.1.3
       otpauth:
         specifier: 9.1.1
         version: 9.1.1
@@ -917,27 +937,18 @@ importers:
       sqlite3:
         specifier: 5.1.7
         version: 5.1.7
-      sse-channel:
-        specifier: 4.0.0
-        version: 4.0.0
       sshpk:
         specifier: 1.17.0
         version: 1.17.0
       swagger-ui-express:
-        specifier: 5.0.0
-        version: 5.0.0(express@4.21.0)
+        specifier: 5.0.1
+        version: 5.0.1(express@4.21.1)
       syslog-client:
         specifier: 1.1.1
         version: 1.1.1
-      tar-stream:
-        specifier: ^3.1.7
-        version: 3.1.7
       typedi:
         specifier: 'catalog:'
         version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
-      unzip-stream:
-        specifier: 0.3.4
-        version: 0.3.4
       uuid:
         specifier: 'catalog:'
         version: 10.0.0
@@ -945,8 +956,8 @@ importers:
         specifier: 13.7.0
         version: 13.7.0
       winston:
-        specifier: 3.8.2
-        version: 3.8.2
+        specifier: 3.14.2
+        version: 3.14.2
       ws:
         specifier: '>=8.17.1'
         version: 8.17.1
@@ -967,11 +978,8 @@ importers:
         version: 3.23.8
     devDependencies:
       '@redocly/cli':
-        specifier: ^1.6.0
-        version: 1.6.0(encoding@0.1.13)
-      '@types/archiver':
-        specifier: ^6.0.2
-        version: 6.0.2
+        specifier: ^1.25.5
+        version: 1.25.5(encoding@0.1.13)(enzyme@3.11.0)
       '@types/aws4':
         specifier: ^1.5.1
         version: 1.11.2
@@ -985,8 +993,8 @@ importers:
         specifier: ^6.1.1
         version: 6.1.1
       '@types/cookie-parser':
-        specifier: ^1.4.2
-        version: 1.4.3
+        specifier: ^1.4.7
+        version: 1.4.7
       '@types/express':
         specifier: 'catalog:'
         version: 4.17.21
@@ -1026,9 +1034,6 @@ importers:
       '@types/syslog-client':
         specifier: ^1.1.2
         version: 1.1.2
-      '@types/unzip-stream':
-        specifier: ^0.3.4
-        version: 0.3.4
       '@types/uuid':
         specifier: 'catalog:'
         version: 10.0.0
@@ -1047,9 +1052,6 @@ importers:
       '@vvo/tzdb':
         specifier: ^6.141.0
         version: 6.141.0
-      chokidar:
-        specifier: 3.5.2
-        version: 3.5.2
       concurrently:
         specifier: ^8.2.0
         version: 8.2.0
@@ -1067,7 +1069,7 @@ importers:
     dependencies:
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+        version: 0.3.3(openai@4.63.0(zod@3.23.8))
       '@n8n/client-oauth2':
         specifier: workspace:*
         version: link:../@n8n/client-oauth2
@@ -1164,10 +1166,10 @@ importers:
         version: 5.15.4
       '@fortawesome/vue-fontawesome':
         specifier: ^3.0.3
-        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.4.21(typescript@5.6.2))
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.6.2))
       element-plus:
         specifier: 2.4.3
-        version: 2.4.3(vue@3.4.21(typescript@5.6.2))
+        version: 2.4.3(vue@3.5.11(typescript@5.6.2))
       markdown-it:
         specifier: ^13.0.2
         version: 13.0.2
@@ -1188,13 +1190,13 @@ importers:
         version: 2.12.1
       vue:
         specifier: catalog:frontend
-        version: 3.4.21(typescript@5.6.2)
+        version: 3.5.11(typescript@5.6.2)
       vue-boring-avatars:
         specifier: ^1.3.0
-        version: 1.3.0(vue@3.4.21(typescript@5.6.2))
+        version: 1.3.0(vue@3.5.11(typescript@5.6.2))
       vue-router:
         specifier: catalog:frontend
-        version: 4.4.2(vue@3.4.21(typescript@5.6.2))
+        version: 4.4.5(vue@3.5.11(typescript@5.6.2))
       xss:
         specifier: 'catalog:'
         version: 1.0.15
@@ -1210,7 +1212,7 @@ importers:
         version: 14.5.2(@testing-library/dom@10.4.0)
       '@testing-library/vue':
         specifier: ^8.1.0
-        version: 8.1.0(@vue/compiler-sfc@3.4.21)(@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))
+        version: 8.1.0(@vue/compiler-sfc@3.5.11)(vue@3.5.11(typescript@5.6.2))
       '@types/markdown-it':
         specifier: ^13.0.9
         version: 13.0.9
@@ -1225,10 +1227,10 @@ importers:
         version: 2.11.0
       '@vitejs/plugin-vue':
         specifier: ^5.1.4
-        version: 5.1.4(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.4.21(typescript@5.6.2))
+        version: 5.1.4(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.5.11(typescript@5.6.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.1(vitest@2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.1.2(vitest@2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       autoprefixer:
         specifier: ^10.4.19
         version: 10.4.19(postcss@8.4.38)
@@ -1243,22 +1245,22 @@ importers:
         version: 3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
       unplugin-icons:
         specifier: ^0.19.0
-        version: 0.19.0(@vue/compiler-sfc@3.4.21)(vue-template-compiler@2.7.14)
+        version: 0.19.0(@vue/compiler-sfc@3.5.11)
       unplugin-vue-components:
         specifier: ^0.27.2
-        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.22.2)(vue@3.4.21(typescript@5.6.2))
+        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.11(typescript@5.6.2))
       vite:
         specifier: catalog:frontend
-        version: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+        version: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
       vitest:
         specifier: catalog:frontend
-        version: 2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
       vitest-mock-extended:
         specifier: catalog:frontend
-        version: 2.0.2(typescript@5.6.2)(vitest@2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.0.2(typescript@5.6.2)(vitest@2.1.2(@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.6.2)
+        specifier: ^2.1.6
+        version: 2.1.6(typescript@5.6.2)
 
   packages/editor-ui:
     dependencies:
@@ -1303,7 +1305,7 @@ importers:
         version: 5.15.4
       '@fortawesome/vue-fontawesome':
         specifier: '*'
-        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.4.21(typescript@5.6.2))
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.6.2))
       '@jsplumb/browser-ui':
         specifier: ^5.13.2
         version: 5.13.2
@@ -1338,35 +1340,38 @@ importers:
         specifier: workspace:*
         version: link:../@n8n/permissions
       '@sentry/vue':
-        specifier: ^8.31.0
-        version: 8.31.0(vue@3.4.21(typescript@5.6.2))
+        specifier: catalog:frontend
+        version: 8.33.1(vue@3.5.11(typescript@5.6.2))
       '@vue-flow/background':
         specifier: ^1.3.0
-        version: 1.3.0(@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))
+        version: 1.3.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
       '@vue-flow/controls':
-        specifier: ^1.1.1
-        version: 1.1.1(@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))
+        specifier: ^1.1.2
+        version: 1.1.2(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
       '@vue-flow/core':
-        specifier: ^1.33.5
-        version: 1.33.5(vue@3.4.21(typescript@5.6.2))
+        specifier: ^1.41.2
+        version: 1.41.2(vue@3.5.11(typescript@5.6.2))
       '@vue-flow/minimap':
-        specifier: ^1.4.0
-        version: 1.4.0(@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))
+        specifier: ^1.5.0
+        version: 1.5.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
       '@vue-flow/node-resizer':
         specifier: ^1.4.0
-        version: 1.4.0(@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))
+        version: 1.4.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
       '@vueuse/components':
         specifier: ^10.11.0
-        version: 10.11.0(vue@3.4.21(typescript@5.6.2))
+        version: 10.11.0(vue@3.5.11(typescript@5.6.2))
       '@vueuse/core':
         specifier: ^10.11.0
-        version: 10.11.0(vue@3.4.21(typescript@5.6.2))
+        version: 10.11.0(vue@3.5.11(typescript@5.6.2))
       axios:
         specifier: 'catalog:'
         version: 1.7.4
       bowser:
         specifier: 2.11.0
         version: 2.11.0
+      change-case:
+        specifier: ^5.4.4
+        version: 5.4.4
       chart.js:
         specifier: ^4.4.0
         version: 4.4.0
@@ -1413,14 +1418,14 @@ importers:
         specifier: workspace:*
         version: link:../workflow
       pinia:
-        specifier: ^2.1.6
-        version: 2.1.6(typescript@5.6.2)(vue@3.4.21(typescript@5.6.2))
+        specifier: ^2.2.4
+        version: 2.2.4(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2))
       prettier:
         specifier: ^3.3.3
         version: 3.3.3
       qrcode.vue:
         specifier: ^3.3.4
-        version: 3.3.4(vue@3.4.21(typescript@5.6.2))
+        version: 3.3.4(vue@3.5.11(typescript@5.6.2))
       stream-browserify:
         specifier: ^3.0.0
         version: 3.0.0
@@ -1435,25 +1440,25 @@ importers:
         version: 1.2.2
       vue:
         specifier: catalog:frontend
-        version: 3.4.21(typescript@5.6.2)
+        version: 3.5.11(typescript@5.6.2)
       vue-agile:
         specifier: ^2.0.0
         version: 2.0.0
       vue-chartjs:
         specifier: ^5.2.0
-        version: 5.2.0(chart.js@4.4.0)(vue@3.4.21(typescript@5.6.2))
+        version: 5.2.0(chart.js@4.4.0)(vue@3.5.11(typescript@5.6.2))
       vue-i18n:
         specifier: ^9.2.2
-        version: 9.2.2(vue@3.4.21(typescript@5.6.2))
+        version: 9.2.2(vue@3.5.11(typescript@5.6.2))
       vue-json-pretty:
         specifier: 2.2.4
-        version: 2.2.4(vue@3.4.21(typescript@5.6.2))
+        version: 2.2.4(vue@3.5.11(typescript@5.6.2))
       vue-markdown-render:
         specifier: catalog:frontend
-        version: 2.2.1(vue@3.4.21(typescript@5.6.2))
+        version: 2.2.1(vue@3.5.11(typescript@5.6.2))
       vue-router:
         specifier: catalog:frontend
-        version: 4.4.2(vue@3.4.21(typescript@5.6.2))
+        version: 4.4.5(vue@3.5.11(typescript@5.6.2))
       vue3-touch-events:
         specifier: ^4.1.3
         version: 4.1.3
@@ -1468,11 +1473,11 @@ importers:
         specifier: ^2.2.228
         version: 2.2.230
       '@pinia/testing':
-        specifier: ^0.1.3
-        version: 0.1.3(pinia@2.1.6(typescript@5.6.2)(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))
+        specifier: ^0.1.6
+        version: 0.1.6(pinia@2.2.4(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
       '@sentry/vite-plugin':
-        specifier: ^2.22.4
-        version: 2.22.4(encoding@0.1.13)
+        specifier: ^2.22.5
+        version: 2.22.5(encoding@0.1.13)
       '@types/dateformat':
         specifier: ^3.0.0
         version: 3.0.1
@@ -1496,7 +1501,7 @@ importers:
         version: 10.0.0
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.1(vitest@2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.1.2(vitest@2.1.2(@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
@@ -1505,22 +1510,22 @@ importers:
         version: 0.1.48
       unplugin-icons:
         specifier: ^0.19.0
-        version: 0.19.0(@vue/compiler-sfc@3.4.21)(vue-template-compiler@2.7.14)
+        version: 0.19.0(@vue/compiler-sfc@3.5.11)
       unplugin-vue-components:
         specifier: ^0.27.2
-        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.22.2)(vue@3.4.21(typescript@5.6.2))
+        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.11(typescript@5.6.2))
       vite:
         specifier: catalog:frontend
-        version: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+        version: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
       vitest:
         specifier: catalog:frontend
-        version: 2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
       vitest-mock-extended:
         specifier: catalog:frontend
-        version: 2.0.2(typescript@5.6.2)(vitest@2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.0.2(typescript@5.6.2)(vitest@2.1.2(@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.6.2)
+        specifier: ^2.1.6
+        version: 2.1.6(typescript@5.6.2)
 
   packages/node-dev:
     dependencies:
@@ -1558,9 +1563,15 @@ importers:
 
   packages/nodes-base:
     dependencies:
+      '@aws-sdk/client-sso-oidc':
+        specifier: 3.666.0
+        version: 3.666.0(@aws-sdk/client-sts@3.666.0)
       '@kafkajs/confluent-schema-registry':
         specifier: 1.0.6
         version: 1.0.6
+      '@n8n/config':
+        specifier: workspace:*
+        version: link:../@n8n/config
       '@n8n/imap':
         specifier: workspace:*
         version: link:../@n8n/imap
@@ -1568,7 +1579,7 @@ importers:
         specifier: 3.9.25
         version: 3.9.25
       alasql:
-        specifier: ^4.4.0
+        specifier: 4.4.0
         version: 4.4.0(encoding@0.1.13)
       amqplib:
         specifier: 0.10.3
@@ -1586,8 +1597,8 @@ importers:
         specifier: 1.0.0-rc.6
         version: 1.0.0-rc.6
       chokidar:
-        specifier: 3.5.2
-        version: 3.5.2
+        specifier: ^4.0.1
+        version: 4.0.1
       cron:
         specifier: 3.1.7
         version: 3.1.7
@@ -1659,7 +1670,7 @@ importers:
         version: 0.5.37
       mongodb:
         specifier: 6.3.0
-        version: 6.3.0(@aws-sdk/credential-providers@3.645.0)(gcp-metadata@5.3.0(encoding@0.1.13))(socks@2.7.1)
+        version: 6.3.0(@aws-sdk/credential-providers@3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0)))(gcp-metadata@5.3.0(encoding@0.1.13))(socks@2.7.1)
       mqtt:
         specifier: 5.7.2
         version: 5.7.2
@@ -1709,7 +1720,7 @@ importers:
         specifier: 1.0.24
         version: 1.0.24
       rrule:
-        specifier: ^2.8.1
+        specifier: 2.8.1
         version: 2.8.1
       rss-parser:
         specifier: 3.13.0
@@ -1733,7 +1744,7 @@ importers:
         specifier: 3.0.3
         version: 3.0.3
       ts-ics:
-        specifier: ^1.2.2
+        specifier: 1.2.2
         version: 1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.23.8)
       typedi:
         specifier: 'catalog:'
@@ -1883,7 +1894,7 @@ importers:
     devDependencies:
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+        version: 0.3.3(openai@4.63.0)
       '@types/deep-equal':
         specifier: ^1.0.1
         version: 1.0.1
@@ -1954,31 +1965,19 @@ packages:
     resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-crypto/crc32c@3.0.0':
-    resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==}
+  '@aws-crypto/crc32c@5.2.0':
+    resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==}
 
-  '@aws-crypto/ie11-detection@3.0.0':
-    resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==}
-
-  '@aws-crypto/sha1-browser@3.0.0':
-    resolution: {integrity: sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==}
-
-  '@aws-crypto/sha256-browser@3.0.0':
-    resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==}
+  '@aws-crypto/sha1-browser@5.2.0':
+    resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==}
 
   '@aws-crypto/sha256-browser@5.2.0':
     resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==}
 
-  '@aws-crypto/sha256-js@3.0.0':
-    resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==}
-
   '@aws-crypto/sha256-js@5.2.0':
     resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-crypto/supports-web-crypto@3.0.0':
-    resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==}
-
   '@aws-crypto/supports-web-crypto@5.2.0':
     resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==}
 
@@ -1988,248 +1987,126 @@ packages:
   '@aws-crypto/util@5.2.0':
     resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==}
 
-  '@aws-sdk/client-bedrock-agent-runtime@3.654.0':
-    resolution: {integrity: sha512-0u2+vt0KcDZ5OrPEfbQFr4aRzNx4SOF+xIuROsV2gMaFYw5xYTv2RRZhEN0jzWc96xaWnAM4FOQUMGqWl+oGzA==}
+  '@aws-sdk/client-bedrock-agent-runtime@3.666.0':
+    resolution: {integrity: sha512-qyxA3HBEaMjopmRLHPkf6vX8vRWj0TqIyRH7uwgYN+mQJ+1+X45ulIuYFTMTpE23jgc4n4P6WytRmj8bLSZR/Q==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-bedrock-runtime@3.645.0':
-    resolution: {integrity: sha512-a5UY1DT1F8HyTU0uwO0rgyBGPkn74QdUWvSaFz6mSX0rfEIVATtreSOZBiAptrZDfh1wPDJjz0CBA9FZVL75ag==}
+  '@aws-sdk/client-bedrock-runtime@3.666.0':
+    resolution: {integrity: sha512-FgMenX1pf50yKohte1GyatifyDEPWGv+39XMcI3/OSvR17eKZ82WxSArHcrRrSSpYiNmy/io7dM5jouQDDMk2A==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-cognito-identity@3.645.0':
-    resolution: {integrity: sha512-nBfWDzWBQI1NCHYqBAmiifhdnLRxQYozaq6OjTuRcALjYJbOdFV7t0w9FWGISOq1OnM7r8UdCXlr2bzdyU0tJA==}
+  '@aws-sdk/client-cognito-identity@3.666.0':
+    resolution: {integrity: sha512-TirQ6hJksC6M2Cwi7rIZS2tP4s3OHDdU4Md/mksMkLT9lkzT8sNLU0DwVO5FlWcwtKmC3gLbIDa+Hqe5CpRDNA==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-kendra@3.654.0':
-    resolution: {integrity: sha512-XpnAcY2/DjfUQR8ktM6OslAIQeM2fHZrB2Ud5gSinVmBJ9NyoQW3r9Hf9mqFF8OAIDEdGXNH/9/41QaUeYljwA==}
+  '@aws-sdk/client-kendra@3.666.0':
+    resolution: {integrity: sha512-DW5cGIGAoZwMXZCrKPPBrAsENZTcuIUekUB53hqnJBcO7gXBIK298ddvg/XfaF8GtWQBzlLUDUeXlFmizqOUkg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-s3@3.478.0':
-    resolution: {integrity: sha512-OUpbCCnK71lQQ07BohJOx9ZER0rPqRAGOVIIVhNEkeN0uYFLzB7/o5a7+FEPUQXEd5rZRZgbxN5xEmnNW/0Waw==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/client-sagemaker@3.646.0':
-    resolution: {integrity: sha512-y1ezoj2D4/pwlftyibkCIvkhHHyQzQOspl8wZFHYyYWcmPsB/fkEndh/1a3nYSMXtw+aduFv25Om9wtXXlH/HQ==}
+  '@aws-sdk/client-s3@3.666.0':
+    resolution: {integrity: sha512-gDBvsm5JlocQH7W6MROWpt80UdlBNENofXaQeVnhEanJXr7K13jtPFC0XwlzPYuoXr8NnNZKA/kLKGjsCVoayQ==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sso-oidc@3.645.0':
-    resolution: {integrity: sha512-X9ULtdk3cO+1ysurEkJ1MSnu6U00qodXx+IVual+1jXX4RYY1WmQmfo7uDKf6FFkz7wW1DAqU+GJIBNQr0YH8A==}
+  '@aws-sdk/client-sagemaker@3.666.0':
+    resolution: {integrity: sha512-m7liz0sVMv08HIM66thhlqOfiIWn233izfDgXyJCA+A77NU9wUcIBHwxp6DdhSVLY/n0mE69Mq1XgyRFr/4udg==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/client-sso-oidc@3.666.0':
+    resolution: {integrity: sha512-mW//v5EvHMU2SulW1FqmjJJPDNhzySRb/YUU+jq9AFDIYUdjF6j6wM+iavCW/4gLqOct0RT7B62z8jqyHkUCEQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sts': ^3.645.0
+      '@aws-sdk/client-sts': ^3.666.0
 
-  '@aws-sdk/client-sso-oidc@3.654.0':
-    resolution: {integrity: sha512-gbHrKsEnaAtmkNCVQzLyiqMzpDaThV/bWl/ODEklI+t6stW3Pe3oDMstEHLfJ6JU5g8sYnx4VLuxlnJMtUkvPw==}
+  '@aws-sdk/client-sso@3.666.0':
+    resolution: {integrity: sha512-+h5Xk64dM4on1MwjTYxlwtI8ilytU7zjTVRzMAYOysmH71Bc8YsLOfonFHvzhF/AXpKJu3f1BhM65S0tasPcrw==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/client-sts@3.666.0':
+    resolution: {integrity: sha512-tw8yxcxvaj0d/A4YJXIh3mISzsQe8rThIVKvpyhEdl1lEoz81skCccX5u3gHajciSdga/V0DxhBbsO+eE1bZkw==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/core@3.666.0':
+    resolution: {integrity: sha512-jxNjs0sAVX+CWwoa4kHUENLHuBwjT1EILBoctmQoiIb1v5KpKwZnSByHTpvUkFmbuwWQPEnJkJCqzIHjEmjisA==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-cognito-identity@3.666.0':
+    resolution: {integrity: sha512-JkqJPSqN5XLEicW4gRtd5DTyg0xD0yIvc7+gWXGJq0crNM8IJB9lbG+q3xBkXSbmcrHQyuD74F+ZGjLxmTQBEQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-env@3.664.0':
+    resolution: {integrity: sha512-95rE+9Voaco0nmKJrXqfJAxSSkSWqlBy76zomiZrUrv7YuijQtHCW8jte6v6UHAFAaBzgFsY7QqBxs15u9SM7g==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-http@3.666.0':
+    resolution: {integrity: sha512-j1Cob+tYmJ/m9agSsFPdAhLfILBqZzolF17XJvmEzQC2edltQ6NR0Wd09GQvtiAFZy7gn1l40bKuxX6Tq5U6XQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-sdk/credential-provider-ini@3.666.0':
+    resolution: {integrity: sha512-u09aUZJQNK8zVAKJKEOQ2mLsv39YxR20US00/WAPNW9sMWWhl4raT97tsalOUc6ZTHOEqHHmEVZXuscINnkaww==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sts': ^3.654.0
+      '@aws-sdk/client-sts': ^3.666.0
 
-  '@aws-sdk/client-sso@3.478.0':
-    resolution: {integrity: sha512-Jxy9cE1JMkPR0PklCpq3cORHnZq/Z4klhSTNGgZNeBWovMa+plor52kyh8iUNHKl3XEJvTbHM7V+dvrr/x0P1g==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/client-sso@3.645.0':
-    resolution: {integrity: sha512-2rc8TjnsNddOeKQ/pfNN7deNvGLXAeKeYtHtGDAiM2qfTKxd2sNcAsZ+JCDLyshuD4xLM5fpUyR0X8As9EAouQ==}
+  '@aws-sdk/credential-provider-node@3.666.0':
+    resolution: {integrity: sha512-C43L9kxAb2lvIZ+eKVuyX9xYrkpg+Zyq0fLasK1wekC6M/Qj/uqE1KFz9ddDE8Dv1HwiE+UZk5psM0KatQpPGQ==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sso@3.654.0':
-    resolution: {integrity: sha512-4kBxs2IzCDtj6a6lRXa/lXK5wWpMGzwKtb+HMXf/rJYVM6x7wYRzc1hYrOd3DYkFQ/sR3dUFj+0mTP0os3aAbA==}
+  '@aws-sdk/credential-provider-process@3.664.0':
+    resolution: {integrity: sha512-sQicIw/qWTsmMw8EUQNJXdrWV5SXaZc2zGdCQsQxhR6wwNO2/rZ5JmzdcwUADmleBVyPYk3KGLhcofF/qXT2Ng==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sts@3.478.0':
-    resolution: {integrity: sha512-D+QID0dYzmn9dcxgKP3/nMndUqiQbDLsqI0Zf2pG4MW5gPhVNKlDGIV3Ztz8SkMjzGJExNOLW2L569o8jshJVw==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/client-sts@3.645.0':
-    resolution: {integrity: sha512-6azXYtvtnAsPf2ShN9vKynIYVcJOpo6IoVmoMAVgNaBJyllP+s/RORzranYZzckqfmrudSxtct4rVapjLWuAMg==}
+  '@aws-sdk/credential-provider-sso@3.666.0':
+    resolution: {integrity: sha512-aaa5Ig8hI7lSh1CSQP0oaLvjylz6+3mKUgdvw69zv0MdX3TUZiQRDCsfqK0P3VNsj/QSvBytSjuNDuSaYcACJg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/client-sts@3.654.0':
-    resolution: {integrity: sha512-tyHa8jsBy+/NQZFHm6Q2Q09Vi9p3EH4yPy6PU8yPewpi2klreObtrUd0anJa6nzjS9SSuqnlZWsRic3cQ4QwCg==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/core@3.477.0':
-    resolution: {integrity: sha512-o0434EH+d1BxHZvgG7z8vph2SYefciQ5RnJw2MgvETGnthgqsnI4nnNJLSw0FVeqCeS18n6vRtzqlGYR2YPCNg==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/core@3.635.0':
-    resolution: {integrity: sha512-i1x/E/sgA+liUE1XJ7rj1dhyXpAKO1UKFUcTTHXok2ARjWTvszHnSXMOsB77aPbmn0fUp1JTx2kHUAZ1LVt5Bg==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/core@3.654.0':
-    resolution: {integrity: sha512-4Rwx7BVaNaFqmXBDmnOkMbyuIFFbpZ+ru4lr660p45zY1QoNNSalechfoRffcokLFOZO+VWEJkdcorPUUU993w==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-cognito-identity@3.645.0':
-    resolution: {integrity: sha512-Z4By/90TaYQZO1dPR1udYhegFiOlSWnZsJOYSAk4Gdny26Tqb78xVLw9R/33CzFblXC4WVSt4gizXTQ/sYyHNg==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-env@3.468.0':
-    resolution: {integrity: sha512-k/1WHd3KZn0EQYjadooj53FC0z24/e4dUZhbSKTULgmxyO62pwh9v3Brvw4WRa/8o2wTffU/jo54tf4vGuP/ZA==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/credential-provider-env@3.620.1':
-    resolution: {integrity: sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-env@3.654.0':
-    resolution: {integrity: sha512-kogsx3Ql81JouHS7DkheCDU9MYAvK0AokxjcshDveGmf7BbgbWCA8Fnb9wjQyNDaOXNvkZu8Z8rgkX91z324/w==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-http@3.635.0':
-    resolution: {integrity: sha512-iJyRgEjOCQlBMXqtwPLIKYc7Bsc6nqjrZybdMDenPDa+kmLg7xh8LxHsu9088e+2/wtLicE34FsJJIfzu3L82g==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-http@3.654.0':
-    resolution: {integrity: sha512-tgmAH4MBi/aDR882lfw48+tDV95ZH3GWc1Eoe6DpNLiM3GN2VfU/cZwuHmi6aq+vAbdIlswBHJ/+va0fOvlyjw==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/credential-provider-ini@3.478.0':
-    resolution: {integrity: sha512-SsrYEYUvTG9ZoPC+zB19AnVoOKID+QIEHJDIi1GCZXW5kTVyr1saTVm4orG2TjYvbHQMddsWtHOvGYXZWAYMbw==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/credential-provider-ini@3.645.0':
-    resolution: {integrity: sha512-LlZW0qwUwNlTaAIDCNpLbPsyXvS42pRIwF92fgtCQedmdnpN3XRUC6hcwSYI7Xru3GGKp3RnceOvsdOaRJORsw==}
+  '@aws-sdk/credential-provider-web-identity@3.664.0':
+    resolution: {integrity: sha512-10ltP1BfSKRJVXd8Yr5oLbo+VSDskWbps0X3szSsxTk0Dju1xvkz7hoIjylWLvtGbvQ+yb2pmsJYKCudW/4DJg==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sts': ^3.645.0
+      '@aws-sdk/client-sts': ^3.664.0
 
-  '@aws-sdk/credential-provider-ini@3.654.0':
-    resolution: {integrity: sha512-DKSdaNu2hwdmuvnm9KnA0NLqMWxxmxSOLWjSUSoFIm++wGXUjPrRMFYKvMktaXnPuyf5my8gF/yGbwzPZ8wlTg==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sts': ^3.654.0
-
-  '@aws-sdk/credential-provider-node@3.478.0':
-    resolution: {integrity: sha512-nwDutJYeHiIZCQDgKIUrsgwAWTil0mNe+cbd+j8fi+wwxkWUzip+F0+z02molJ8WrUUKNRhqB1V5aVx7IranuA==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/credential-provider-node@3.645.0':
-    resolution: {integrity: sha512-eGFFuNvLeXjCJf5OCIuSEflxUowmK+bCS+lK4M8ofsYOEGAivdx7C0UPxNjHpvM8wKd8vpMl5phTeS9BWX5jMQ==}
+  '@aws-sdk/credential-providers@3.666.0':
+    resolution: {integrity: sha512-BtkxznPF8a8vUCEiTasHhLUjsgkm7Sc0mxZeOY+NtGMfQaJxx/q/tj5bFmtMNmdcbiEcxUV6bybb6qdN1PM/jg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-node@3.654.0':
-    resolution: {integrity: sha512-wPV7CNYaXDEc+SS+3R0v8SZwkHRUE1z2k2j1d49tH5QBDT4tb/k2V/biXWkwSk3hbR+IMWXmuhJDv/5lybhIvg==}
+  '@aws-sdk/middleware-bucket-endpoint@3.664.0':
+    resolution: {integrity: sha512-KP+foxGaAclhRI63ElZPvVeG5oajkbNhE7wiW34UoSw8wI2l+lmm36zkiebfP4K5HRyADS+KvGw95851N++s2A==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-process@3.468.0':
-    resolution: {integrity: sha512-OYSn1A/UsyPJ7Z8Q2cNhTf55O36shPmSsvOfND04nSfu1nPaR+VUvvsP7v+brhGpwC/GAKTIdGAo4blH31BS6A==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/credential-provider-process@3.620.1':
-    resolution: {integrity: sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg==}
+  '@aws-sdk/middleware-expect-continue@3.664.0':
+    resolution: {integrity: sha512-7hvF+HQhDFvBCzxWFmFOa6tWkVjRAaTR/Ltt03TAZ6JzfIayqnqKFvmdvYFfIeD2w3x4gx24zooRillFk4e3mQ==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-process@3.654.0':
-    resolution: {integrity: sha512-PmQoo8sZ9Q2Ow8OMzK++Z9lI7MsRUG7sNq3E72DVA215dhtTICTDQwGlXH2AAmIp7n+G9LLRds+4wo2ehG4mkg==}
+  '@aws-sdk/middleware-flexible-checksums@3.666.0':
+    resolution: {integrity: sha512-jDbItXr60OsZwgRNhRMbomf9TitQ3nomV6WR3WZ7wHc8fFcwV67+OnoV1rv091HsC4qYuqp8i1YKecJuuiefrQ==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-sso@3.478.0':
-    resolution: {integrity: sha512-LsDShG51X/q+s5ZFN7kHVqrd8ZHdyEyHqdhoocmRvvw2Dif50M0AqQfvCrW1ndj5CNzXO4x/eH8EK5ZOVlS6Sg==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/credential-provider-sso@3.645.0':
-    resolution: {integrity: sha512-d6XuChAl5NCsCrUexc6AFb4efPmb9+66iwPylKG+iMTMYgO1ackfy1Q2/f35jdn0jolkPkzKsVyfzsEVoID6ew==}
+  '@aws-sdk/middleware-host-header@3.664.0':
+    resolution: {integrity: sha512-4tCXJ+DZWTq38eLmFgnEmO8X4jfWpgPbWoCyVYpRHCPHq6xbrU65gfwS9jGx25L4YdEce641ChI9TKLryuUgRA==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-sso@3.654.0':
-    resolution: {integrity: sha512-7GFme6fWEdA/XYKzZPOAdj/jS6fMBy1NdSIZsDXikS0v9jU+ZzHrAaWt13YLzHyjgxB9Sg9id9ncdY1IiubQXQ==}
+  '@aws-sdk/middleware-location-constraint@3.664.0':
+    resolution: {integrity: sha512-hHMdJqq83cDnSTVhrSDsOrm1DyFtS1rteSwuqN7dGNr093bluCqH1VpnS/8juYzux8QGnzRecs9qV3hncGGxPw==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/credential-provider-web-identity@3.468.0':
-    resolution: {integrity: sha512-rexymPmXjtkwCPfhnUq3EjO1rSkf39R4Jz9CqiM7OsqK2qlT5Y/V3gnMKn0ZMXsYaQOMfM3cT5xly5R+OKDHlw==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/credential-provider-web-identity@3.621.0':
-    resolution: {integrity: sha512-w7ASSyfNvcx7+bYGep3VBgC3K6vEdLmlpjT7nSIHxxQf+WSdvy+HynwJosrpZax0sK5q0D1Jpn/5q+r5lwwW6w==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sts': ^3.621.0
-
-  '@aws-sdk/credential-provider-web-identity@3.654.0':
-    resolution: {integrity: sha512-6a2g9gMtZToqSu+CusjNK5zvbLJahQ9di7buO3iXgbizXpLXU1rnawCpWxwslMpT5fLgMSKDnKDrr6wdEk7jSw==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sts': ^3.654.0
-
-  '@aws-sdk/credential-providers@3.645.0':
-    resolution: {integrity: sha512-6g9qMngrMCvHNsxmh/1urnWKrvaa2fv55b3bYwPxwJCYAvg/xc7bV8YHL7GS2rJpACG707k9G86DTW+Hab8bJA==}
+  '@aws-sdk/middleware-logger@3.664.0':
+    resolution: {integrity: sha512-eNykMqQuv7eg9pAcaLro44fscIe1VkFfhm+gYnlxd+PH6xqapRki1E68VHehnIptnVBdqnWfEqLUSLGm9suqhg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-bucket-endpoint@3.470.0':
-    resolution: {integrity: sha512-vLXXNWtsRmEIwzJ9HUQfIuTNAsEzvCv0Icsnkvt2BiBZXnmHdp2vIC3e3+kfy1D7dVQloXqMmnfcLu/BUMu2Jw==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-expect-continue@3.468.0':
-    resolution: {integrity: sha512-/wmLjmfgeulxhhmnxX3X3N933TvGsYckVIFjAtDSpLjqkbwzEcNiLq7AdmNJ4BfxG0MCMgcht561DCCD19x8Bg==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-flexible-checksums@3.468.0':
-    resolution: {integrity: sha512-LQwL/N5MCj3Y5keLLewHTqeAXUIMsHFZyxDXRm/uxrOon9ufLKDvGvzAmfwn1/CuSUo66ZfT8VPSA4BsC90RtA==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-host-header@3.468.0':
-    resolution: {integrity: sha512-gwQ+/QhX+lhof304r6zbZ/V5l5cjhGRxLL3CjH1uJPMcOAbw9wUlMdl+ibr8UwBZ5elfKFGiB1cdW/0uMchw0w==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-host-header@3.620.0':
-    resolution: {integrity: sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==}
+  '@aws-sdk/middleware-recursion-detection@3.664.0':
+    resolution: {integrity: sha512-jq27WMZhm+dY8BWZ9Ipy3eXtZj0lJzpaKQE3A3tH5AOIlUV/gqrmnJ9CdqVVef4EJsq9Yil4ZzQjKKmPsxveQg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-host-header@3.654.0':
-    resolution: {integrity: sha512-rxGgVHWKp8U2ubMv+t+vlIk7QYUaRCHaVpmUlJv0Wv6Q0KeO9a42T9FxHphjOTlCGQOLcjCreL9CF8Qhtb4mdQ==}
+  '@aws-sdk/middleware-sdk-s3@3.666.0':
+    resolution: {integrity: sha512-JUUCDBbt0+AQTwE9gvyn1zaN1QA+wFj5A+DO2igWuIRkR/nU5oHtsoyZY0+lL+uvZpsstmJn1Eeu04E9ourwag==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-location-constraint@3.468.0':
-    resolution: {integrity: sha512-0gBX/lDynQr4YIhM9h1dVnkVWqrg+34iOCVIUq8jHxzUzgZWglGkG9lHGGg0r1xkLTmegeoo1OKH8wrQ6n33Cg==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-logger@3.468.0':
-    resolution: {integrity: sha512-X5XHKV7DHRXI3f29SAhJPe/OxWRFgDWDMMCALfzhmJfCi6Jfh0M14cJKoC+nl+dk9lB+36+jKjhjETZaL2bPlA==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-logger@3.609.0':
-    resolution: {integrity: sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==}
+  '@aws-sdk/middleware-ssec@3.664.0':
+    resolution: {integrity: sha512-uyMnxku5ygRxr/z4pO9ul8Rgn2CoFcKCaKnfHfTgVo2yV/jKHI3rAvyD3OtOO7k4S0odaJzss2Fw6GsIKZy5AQ==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/middleware-logger@3.654.0':
-    resolution: {integrity: sha512-OQYb+nWlmASyXfRb989pwkJ9EVUMP1CrKn2eyTk3usl20JZmKo2Vjis6I0tLUkMSxMhnBJJlQKyWkRpD/u1FVg==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-recursion-detection@3.468.0':
-    resolution: {integrity: sha512-vch9IQib2Ng9ucSyRW2eKNQXHUPb5jUPCLA5otTW/8nGjcOU37LxQG4WrxO7uaJ9Oe8hjHO+hViE3P0KISUhtA==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-recursion-detection@3.620.0':
-    resolution: {integrity: sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-recursion-detection@3.654.0':
-    resolution: {integrity: sha512-gKSomgltKVmsT8sC6W7CrADZ4GHwX9epk3GcH6QhebVO3LA9LRbkL3TwOPUXakxxOLLUTYdOZLIOtFf7iH00lg==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-sdk-s3@3.474.0':
-    resolution: {integrity: sha512-62aAo/8u5daIabeJ+gseYeHeShe9eYH6mH+kfWmLsHybXCCv1EaD/ZkdXWNhL0HZ3bUI1z1SF1p8jjTAWALnwA==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-signing@3.468.0':
-    resolution: {integrity: sha512-s+7fSB1gdnnTj5O0aCCarX3z5Vppop8kazbNSZADdkfHIDWCN80IH4ZNjY3OWqaAz0HmR4LNNrovdR304ojb4Q==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-ssec@3.468.0':
-    resolution: {integrity: sha512-y1qLW24wRkOGBTK5d6eJXf6d8HYo4rzT4a1mNDN1rd18NSffwQ6Yke5qeUiIaxa0y/l+FvvNYErbhYtij2rJoQ==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-user-agent@3.478.0':
-    resolution: {integrity: sha512-Rec+nAPIzzwxgHPW+xqY6tooJGFOytpYg/xSRv8/IXl3xKGhmpMGs6gDWzmMBv/qy5nKTvLph/csNWJ98GWXCw==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/middleware-user-agent@3.645.0':
-    resolution: {integrity: sha512-NpTAtqWK+49lRuxfz7st9for80r4NriCMK0RfdJSoPFVntjsSQiQ7+2nW2XL05uVY633e9DvCAw8YatX3zd1mw==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/middleware-user-agent@3.654.0':
-    resolution: {integrity: sha512-liCcqPAyRsr53cy2tYu4qeH4MMN0eh9g6k56XzI5xd4SghXH5YWh4qOYAlQ8T66ZV4nPMtD8GLtLXGzsH8moFg==}
+  '@aws-sdk/middleware-user-agent@3.666.0':
+    resolution: {integrity: sha512-d8XJ103SGCMsFIKEowpOaZr0W8AkLNd+3CS7W95yb6YmN7lcNGL54RtTSy3m8YJI6W2jXftPFN2oLG4K3aywVQ==}
     engines: {node: '>=16.0.0'}
 
   '@aws-sdk/node-http-handler@3.374.0':
@@ -2242,104 +2119,46 @@ packages:
     engines: {node: '>=14.0.0'}
     deprecated: This package has moved to @smithy/protocol-http
 
-  '@aws-sdk/region-config-resolver@3.470.0':
-    resolution: {integrity: sha512-C1o1J06iIw8cyAAOvHqT4Bbqf+PgQ/RDlSyjt2gFfP2OovDpc2o2S90dE8f8iZdSGpg70N5MikT1DBhW9NbhtQ==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/region-config-resolver@3.614.0':
-    resolution: {integrity: sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==}
+  '@aws-sdk/region-config-resolver@3.664.0':
+    resolution: {integrity: sha512-o/B8dg8K+9714RGYPgMxZgAChPe/MTSMkf/eHXTUFHNik5i1HgVKfac22njV2iictGy/6GhpFsKa1OWNYAkcUg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/region-config-resolver@3.654.0':
-    resolution: {integrity: sha512-ydGOrXJxj3x0sJhsXyTmvJVLAE0xxuTWFJihTl67RtaO7VRNtd82I3P3bwoMMaDn5WpmV5mPo8fEUDRlBm3fPg==}
+  '@aws-sdk/signature-v4-multi-region@3.666.0':
+    resolution: {integrity: sha512-dbuJp0riLeXkyh7wWCK4Jra/kOvVoLTIq0jHeBoFMTOEvU/DAoo8KjIvHPu0TJ2nQzccW0RW40DAabUIVEQxCg==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/signature-v4-multi-region@3.474.0':
-    resolution: {integrity: sha512-93OWRQgTJZASXLrlUNX7mmXknNkYxFYldRLARmYQccONmnIqgYQW0lQj8BFwqkHJTzSMik3/UsU0SHKwZ9ynYA==}
-    engines: {node: '>=14.0.0'}
-
   '@aws-sdk/signature-v4@3.374.0':
     resolution: {integrity: sha512-2xLJvSdzcZZAg0lsDLUAuSQuihzK0dcxIK7WmfuJeF7DGKJFmp9czQmz5f3qiDz6IDQzvgK1M9vtJSVCslJbyQ==}
     engines: {node: '>=14.0.0'}
     deprecated: This package has moved to @smithy/signature-v4
 
-  '@aws-sdk/token-providers@3.478.0':
-    resolution: {integrity: sha512-7b5tj1y/wGHZIZ+ckjOUKgKrMuCJMF/G1UKZKIqqdekeEsjcThbvoxAMeY0FEowu2ODVk/ggOmpBFxcu0iYd6A==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/token-providers@3.614.0':
-    resolution: {integrity: sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==}
+  '@aws-sdk/token-providers@3.664.0':
+    resolution: {integrity: sha512-dBAvXW2/6bAxidvKARFxyCY2uCynYBKRFN00NhS1T5ggxm3sUnuTpWw1DTjl02CVPkacBOocZf10h8pQbHSK8w==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@aws-sdk/client-sso-oidc': ^3.614.0
+      '@aws-sdk/client-sso-oidc': ^3.664.0
 
-  '@aws-sdk/token-providers@3.654.0':
-    resolution: {integrity: sha512-D8GeJYmvbfWkQDtTB4owmIobSMexZel0fOoetwvgCQ/7L8VPph3Q2bn1TRRIXvH7wdt6DcDxA3tKMHPBkT3GlA==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sso-oidc': ^3.654.0
-
-  '@aws-sdk/types@3.468.0':
-    resolution: {integrity: sha512-rx/9uHI4inRbp2tw3Y4Ih4PNZkVj32h7WneSg3MVgVjAoVD5Zti9KhS5hkvsBxfgmQmg0AQbE+b1sy5WGAgntA==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/types@3.609.0':
-    resolution: {integrity: sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==}
+  '@aws-sdk/types@3.664.0':
+    resolution: {integrity: sha512-+GtXktvVgpreM2b+NJL9OqZGsOzHwlCUrO8jgQUvH/yA6Kd8QO2YFhQCp0C9sSzTteZJVqGBu8E0CQurxJHPbw==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/types@3.654.0':
-    resolution: {integrity: sha512-VWvbED3SV+10QJIcmU/PKjsKilsTV16d1I7/on4bvD/jo1qGeMXqLDBSen3ks/tuvXZF/mFc7ZW/W2DiLVtO7A==}
+  '@aws-sdk/util-arn-parser@3.568.0':
+    resolution: {integrity: sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==}
     engines: {node: '>=16.0.0'}
 
-  '@aws-sdk/util-arn-parser@3.465.0':
-    resolution: {integrity: sha512-zOJ82vzDJFqBX9yZBlNeHHrul/kpx/DCoxzW5UBbZeb26kfV53QhMSoEmY8/lEbBqlqargJ/sgRC845GFhHNQw==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/util-endpoints@3.478.0':
-    resolution: {integrity: sha512-u9Mcg3euGJGs5clPt9mBuhBjHiEKiD0PnfvArhfq9i+dcY5mbCq/i1Dezp3iv1fZH9xxQt7hPXDfSpt1yUSM6g==}
-    engines: {node: '>=14.0.0'}
-
-  '@aws-sdk/util-endpoints@3.645.0':
-    resolution: {integrity: sha512-Oe+xaU4ic4PB1k3pb5VTC1/MWES13IlgpaQw01bVHGfwP6Yv6zZOxizRzca2Y3E+AyR+nKD7vXtHRY+w3bi4bg==}
-    engines: {node: '>=16.0.0'}
-
-  '@aws-sdk/util-endpoints@3.654.0':
-    resolution: {integrity: sha512-i902fcBknHs0Irgdpi62+QMvzxE+bczvILXigYrlHL4+PiEnlMVpni5L5W1qCkNZXf8AaMrSBuR1NZAGp6UOUw==}
+  '@aws-sdk/util-endpoints@3.664.0':
+    resolution: {integrity: sha512-KrXoHz6zmAahVHkyWMRT+P6xJaxItgmklxEDrT+npsUB4d5C/lhw16Crcp9TDi828fiZK3GYKRAmmNhvmzvBNg==}
     engines: {node: '>=16.0.0'}
 
   '@aws-sdk/util-locate-window@3.310.0':
     resolution: {integrity: sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==}
     engines: {node: '>=14.0.0'}
 
-  '@aws-sdk/util-user-agent-browser@3.468.0':
-    resolution: {integrity: sha512-OJyhWWsDEizR3L+dCgMXSUmaCywkiZ7HSbnQytbeKGwokIhD69HTiJcibF/sgcM5gk4k3Mq3puUhGnEZ46GIig==}
+  '@aws-sdk/util-user-agent-browser@3.664.0':
+    resolution: {integrity: sha512-c/PV3+f1ss4PpskHbcOxTZ6fntV2oXy/xcDR9nW+kVaz5cM1G702gF0rvGLKPqoBwkj2rWGe6KZvEBeLzynTUQ==}
 
-  '@aws-sdk/util-user-agent-browser@3.609.0':
-    resolution: {integrity: sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==}
-
-  '@aws-sdk/util-user-agent-browser@3.654.0':
-    resolution: {integrity: sha512-ykYAJqvnxLt7wfrqya28wuH3/7NdrwzfiFd7NqEVQf7dXVxL5RPEpD7DxjcyQo3DsHvvdUvGZVaQhozycn1pzA==}
-
-  '@aws-sdk/util-user-agent-node@3.470.0':
-    resolution: {integrity: sha512-QxsZ9iVHcBB/XRdYvwfM5AMvNp58HfqkIrH88mY0cmxuvtlIGDfWjczdDrZMJk9y0vIq+cuoCHsGXHu7PyiEAQ==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      aws-crt: '>=1.0.0'
-    peerDependenciesMeta:
-      aws-crt:
-        optional: true
-
-  '@aws-sdk/util-user-agent-node@3.614.0':
-    resolution: {integrity: sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      aws-crt: '>=1.0.0'
-    peerDependenciesMeta:
-      aws-crt:
-        optional: true
-
-  '@aws-sdk/util-user-agent-node@3.654.0':
-    resolution: {integrity: sha512-a0ojjdBN6pqv6gB4H/QPPSfhs7mFtlVwnmKCM/QrTaFzN0U810PJ1BST3lBx5sa23I5jWHGaoFY+5q65C3clLQ==}
+  '@aws-sdk/util-user-agent-node@3.666.0':
+    resolution: {integrity: sha512-DzbOMcAqrn51Z0fz5FvofaYmQA+sOJKO2cb8zQrix3TkzsTw1vRLo/cgQUJuJRGptbQCe1gnj7+21Gd5hpU6Ag==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
       aws-crt: '>=1.0.0'
@@ -2350,9 +2169,9 @@ packages:
   '@aws-sdk/util-utf8-browser@3.259.0':
     resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==}
 
-  '@aws-sdk/xml-builder@3.472.0':
-    resolution: {integrity: sha512-PwjVxz1hr9up8QkddabuScPZ/d5aDHgvHYgK4acHYzltXL4wngfvimi5ZqXTzVWF2QANxHmWnHUr45QJX71oJQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/xml-builder@3.662.0':
+    resolution: {integrity: sha512-ikLkXn0igUpnJu2mCZjklvmcDGWT9OaLRv3JyC/cRkTaaSrblPjPM7KKsltxdMTLQ+v7fjCN0TsJpxphMfaOPA==}
+    engines: {node: '>=16.0.0'}
 
   '@azure/abort-controller@1.1.0':
     resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
@@ -2381,7 +2200,7 @@ packages:
   '@azure/core-http@3.0.4':
     resolution: {integrity: sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ==}
     engines: {node: '>=14.0.0'}
-    deprecated: deprecating as we migrated to core v2
+    deprecated: This package is no longer supported. Please migrate to use @azure/core-rest-pipeline
 
   '@azure/core-lro@2.4.0':
     resolution: {integrity: sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==}
@@ -2501,10 +2320,6 @@ packages:
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-string-parser@7.24.6':
-    resolution: {integrity: sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-string-parser@7.24.8':
     resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
     engines: {node: '>=6.9.0'}
@@ -2513,10 +2328,6 @@ packages:
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-identifier@7.24.6':
-    resolution: {integrity: sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-validator-identifier@7.24.7':
     resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
     engines: {node: '>=6.9.0'}
@@ -2533,11 +2344,6 @@ packages:
     resolution: {integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/parser@7.24.6':
-    resolution: {integrity: sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
   '@babel/parser@7.25.6':
     resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==}
     engines: {node: '>=6.0.0'}
@@ -2628,10 +2434,6 @@ packages:
     resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.24.6':
-    resolution: {integrity: sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/types@7.25.6':
     resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
     engines: {node: '>=6.9.0'}
@@ -2692,6 +2494,13 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@cfaester/enzyme-adapter-react-18@0.8.0':
+    resolution: {integrity: sha512-3Z3ThTUouHwz8oIyhTYQljEMNRFtlVyc3VOOHCbxs47U6cnXs8K9ygi/c1tv49s7MBlTXeIcuN+Ttd9aPtILFQ==}
+    peerDependencies:
+      enzyme: ^3.11.0
+      react: '>=18'
+      react-dom: '>=18'
+
   '@chromatic-com/storybook@2.0.2':
     resolution: {integrity: sha512-7bPIliISedeIpnVKbzktysFYW5n56bN91kxuOj1XXKixmjbUHRUMvcXd4K2liN6MiR5ZqJtmtcPsZ6CebbGlEA==}
     engines: {node: '>=16.0.0', yarn: '>=1.22.18'}
@@ -2744,6 +2553,10 @@ packages:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
 
+  '@colors/colors@1.6.0':
+    resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==}
+    engines: {node: '>=0.1.90'}
+
   '@common.js/is-network-error@1.0.1':
     resolution: {integrity: sha512-dkk7FX8L/JLia5pi+IQ11lCw2D6FTmbWL2iWTHgCbP40/deeXgknlkEQcQ/rOkjwQbqp8RZ4ey/anR17K66sqw==}
     engines: {node: '>=16'}
@@ -2788,141 +2601,147 @@ packages:
   '@emotion/unitless@0.8.0':
     resolution: {integrity: sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==}
 
-  '@esbuild/aix-ppc64@0.20.2':
-    resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
-    engines: {node: '>=12'}
+  '@esbuild/aix-ppc64@0.24.0':
+    resolution: {integrity: sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==}
+    engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/android-arm64@0.20.2':
-    resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
-    engines: {node: '>=12'}
+  '@esbuild/android-arm64@0.24.0':
+    resolution: {integrity: sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm@0.20.2':
-    resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
-    engines: {node: '>=12'}
+  '@esbuild/android-arm@0.24.0':
+    resolution: {integrity: sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==}
+    engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-x64@0.20.2':
-    resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
-    engines: {node: '>=12'}
+  '@esbuild/android-x64@0.24.0':
+    resolution: {integrity: sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/darwin-arm64@0.20.2':
-    resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
-    engines: {node: '>=12'}
+  '@esbuild/darwin-arm64@0.24.0':
+    resolution: {integrity: sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.20.2':
-    resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
-    engines: {node: '>=12'}
+  '@esbuild/darwin-x64@0.24.0':
+    resolution: {integrity: sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.20.2':
-    resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
-    engines: {node: '>=12'}
+  '@esbuild/freebsd-arm64@0.24.0':
+    resolution: {integrity: sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.20.2':
-    resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
-    engines: {node: '>=12'}
+  '@esbuild/freebsd-x64@0.24.0':
+    resolution: {integrity: sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/linux-arm64@0.20.2':
-    resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-arm64@0.24.0':
+    resolution: {integrity: sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.20.2':
-    resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-arm@0.24.0':
+    resolution: {integrity: sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==}
+    engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.20.2':
-    resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-ia32@0.24.0':
+    resolution: {integrity: sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==}
+    engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.20.2':
-    resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-loong64@0.24.0':
+    resolution: {integrity: sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==}
+    engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.20.2':
-    resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-mips64el@0.24.0':
+    resolution: {integrity: sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==}
+    engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.20.2':
-    resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-ppc64@0.24.0':
+    resolution: {integrity: sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==}
+    engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.20.2':
-    resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-riscv64@0.24.0':
+    resolution: {integrity: sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==}
+    engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.20.2':
-    resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-s390x@0.24.0':
+    resolution: {integrity: sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==}
+    engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-x64@0.20.2':
-    resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
-    engines: {node: '>=12'}
+  '@esbuild/linux-x64@0.24.0':
+    resolution: {integrity: sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-x64@0.20.2':
-    resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
-    engines: {node: '>=12'}
+  '@esbuild/netbsd-x64@0.24.0':
+    resolution: {integrity: sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-x64@0.20.2':
-    resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
-    engines: {node: '>=12'}
+  '@esbuild/openbsd-arm64@0.24.0':
+    resolution: {integrity: sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.24.0':
+    resolution: {integrity: sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/sunos-x64@0.20.2':
-    resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
-    engines: {node: '>=12'}
+  '@esbuild/sunos-x64@0.24.0':
+    resolution: {integrity: sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/win32-arm64@0.20.2':
-    resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
-    engines: {node: '>=12'}
+  '@esbuild/win32-arm64@0.24.0':
+    resolution: {integrity: sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.20.2':
-    resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
-    engines: {node: '>=12'}
+  '@esbuild/win32-ia32@0.24.0':
+    resolution: {integrity: sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==}
+    engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-x64@0.20.2':
-    resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
-    engines: {node: '>=12'}
+  '@esbuild/win32-x64@0.24.0':
+    resolution: {integrity: sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
@@ -2996,11 +2815,11 @@ packages:
   '@gar/promisify@1.1.3':
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
 
-  '@getzep/zep-cloud@1.0.11':
-    resolution: {integrity: sha512-rJLGzoQoOWmW+IMmfmTerR3P/W1VbTLGD022KKn1j9Cdv98Nb/lKBp+vFKUg9s/IDSz4s7xjMI2lZJzRN9Tz+Q==}
+  '@getzep/zep-cloud@1.0.12':
+    resolution: {integrity: sha512-bqs8zetYaducNneOq9kU1ciW8IfuiPzGOGqLUwFLv0982bobe4HsZTKeY1/Pt0bQUf6/V1VWYT8vFHSCj/qy4A==}
     peerDependencies:
-      '@langchain/core': '>=0.1.29 <0.3.0'
-      langchain: '>=0.1.19 <0.3.0'
+      '@langchain/core': '>=0.1.29 <0.4.0'
+      langchain: '>=0.1.19 <0.4.0'
     peerDependenciesMeta:
       '@langchain/core':
         optional: true
@@ -3218,12 +3037,16 @@ packages:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
 
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
   '@jridgewell/set-array@1.2.1':
     resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
     engines: {node: '>=6.0.0'}
 
-  '@jridgewell/source-map@0.3.2':
-    resolution: {integrity: sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==}
+  '@jridgewell/source-map@0.3.6':
+    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
 
   '@jridgewell/sourcemap-codec@1.4.15':
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
@@ -3778,18 +3601,18 @@ packages:
       '@types/react': '>=16'
       react: '>=16'
 
-  '@microsoft/api-extractor-model@7.28.13':
-    resolution: {integrity: sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw==}
+  '@microsoft/api-extractor-model@7.29.6':
+    resolution: {integrity: sha512-gC0KGtrZvxzf/Rt9oMYD2dHvtN/1KPEYsrQPyMKhLHnlVuO/f4AFN3E4toqZzD2pt4LhkKoYmL2H9tX3yCOyRw==}
 
-  '@microsoft/api-extractor@7.43.0':
-    resolution: {integrity: sha512-GFhTcJpB+MI6FhvXEI9b2K0snulNLWHqC/BbcJtyNYcKUiw7l3Lgis5ApsYncJ0leALX7/of4XfmXk+maT111w==}
+  '@microsoft/api-extractor@7.47.7':
+    resolution: {integrity: sha512-fNiD3G55ZJGhPOBPMKD/enozj8yxJSYyVJWxRWdcUtw842rvthDHJgUWq9gXQTensFlMHv2wGuCjjivPv53j0A==}
     hasBin: true
 
-  '@microsoft/tsdoc-config@0.16.2':
-    resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==}
+  '@microsoft/tsdoc-config@0.17.0':
+    resolution: {integrity: sha512-v/EYRXnCAIHxOHW+Plb6OWuUoMotxTN0GLatnpOb1xq0KuTNw/WI3pamJx/UbsoJP5k9MCw1QxvvhPcF9pH3Zg==}
 
-  '@microsoft/tsdoc@0.14.2':
-    resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==}
+  '@microsoft/tsdoc@0.15.0':
+    resolution: {integrity: sha512-HZpPoABogPvjeJOdzCOSJsXeL/SMCBgBZMVC3X3d7YYp2gf31MfxhUoYUNwf1ERPJOnQc0wkFn9trqI6ZEdZuA==}
 
   '@miragejs/pretender-node-polyfill@0.1.2':
     resolution: {integrity: sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==}
@@ -3797,8 +3620,8 @@ packages:
   '@mistralai/mistralai@0.4.0':
     resolution: {integrity: sha512-KmFzNro1RKxIFh19J3osmUQhucefBBauMXN5fa9doG6dT9OHR/moBvvn+riVlR7c0AVfuxO8Dfa03AyLYYzbyg==}
 
-  '@mongodb-js/saslprep@1.1.0':
-    resolution: {integrity: sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==}
+  '@mongodb-js/saslprep@1.1.9':
+    resolution: {integrity: sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==}
 
   '@mozilla/readability@0.5.0':
     resolution: {integrity: sha512-Z+CZ3QaosfFaTqvhQsIktyGrjFjSC0Fa4EMph4mqKnWhmyoGICsV/8QK+8HpXut6zV7zwfWwqDmEjtk1Qf6EgQ==}
@@ -3849,15 +3672,15 @@ packages:
     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==}
+  '@n8n/typeorm@0.3.20-12':
+    resolution: {integrity: sha512-Jc+Uys9HXTRq+u2XTqnAqjZVvAPwYH4qy4wRcizN0u7sfBvRGRpeF8ZAoplOGjXPRBG278QKcfVAJ64j/bj+uQ==}
     engines: {node: '>=16.13.0'}
     hasBin: true
     peerDependencies:
       '@google-cloud/spanner': ^5.18.0
       '@libsql/client': ^0.4.2
       '@sap/hana-client': ^2.12.25
-      '@sentry/node': ^7.87.0
+      '@sentry/node': <=8.x
       better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0
       hdb-pool: ^0.1.6
       ioredis: ^5.0.4
@@ -3918,8 +3741,8 @@ packages:
     engines: {node: '>=18.10', pnpm: '>=9.6'}
     hasBin: true
 
-  '@n8n_io/ai-assistant-sdk@1.9.4':
-    resolution: {integrity: sha512-jFBT3SNPQuPTiJceCVIO0VB06ALa6Az1nfsRnZYdm+HMIle1ZFZDIjf32tqYoa2VvrqitfR/fs7CiMlVQUkIRg==}
+  '@n8n_io/ai-assistant-sdk@1.10.3':
+    resolution: {integrity: sha512-oHuYryPoWa+KcIf7ihrlXSVpi3XhVPmZX4tUX4TMvgAeipu7yhf7ZSXQFeBUx6zD1oa2zOXIs4b0NsXELrZWqg==}
     engines: {node: '>=20.15', pnpm: '>=8.14'}
 
   '@n8n_io/license-sdk@2.13.1':
@@ -3985,10 +3808,10 @@ packages:
     resolution: {integrity: sha512-0cAG0d/6knVZgVyXM1II4qG3dyOepLuAQsCXTOJomdA7iQxf+/Om9mq9Cw4QObr56oZ+lqtptlw5qz0BQaBX2Q==}
     engines: {node: '>=18.0.0'}
 
-  '@pinia/testing@0.1.3':
-    resolution: {integrity: sha512-D2Ds2s69kKFaRf2KCcP1NhNZEg5+we59aRyQalwRm7ygWfLM25nDH66267U3hNvRUOTx8ofL24GzodZkOmB5xw==}
+  '@pinia/testing@0.1.6':
+    resolution: {integrity: sha512-Q40s3kpjXpjmcnc61l84wyG83yVmkBi5rRdSoPpwQoRfSnNKKr52XjFFt6hP8iBxehYS9NR+D57T1uzgnEVPHg==}
     peerDependencies:
-      pinia: '>=2.1.5'
+      pinia: '>=2.2.3'
 
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
@@ -4067,16 +3890,19 @@ packages:
     peerDependencies:
       '@redis/client': ^1.0.0
 
-  '@redocly/ajv@8.11.0':
-    resolution: {integrity: sha512-9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw==}
+  '@redocly/ajv@8.11.2':
+    resolution: {integrity: sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==}
 
-  '@redocly/cli@1.6.0':
-    resolution: {integrity: sha512-0naVFJGR2tVcpMIHSFRr2HAoyy70qMqDAP6kXcnOdkGkwLRJ8s/5n1STwsym/yZwNkhrt2M0cKT6KAMlTUeCeg==}
+  '@redocly/cli@1.25.5':
+    resolution: {integrity: sha512-sFh4A8wqwuig7mF/nYNVIyxSfKKZikWC+uVH6OB1IepYQXNsHFaLAU1VaNI9gS5mMvWmYx5SEuSCVB9LaNFBhw==}
     engines: {node: '>=14.19.0', npm: '>=7.0.0'}
     hasBin: true
 
-  '@redocly/openapi-core@1.6.0':
-    resolution: {integrity: sha512-oao6Aey4peLKfagzWGb6N7OBI6CoDWEP4ka/XjrUNZw+UoKVVg3hVBXW4Vr3CJ2O8j6wEa2i+Lbb92VQQsoxwg==}
+  '@redocly/config@0.12.1':
+    resolution: {integrity: sha512-RW3rSirfsPdr0uvATijRDU3f55SuZV3m7/ppdTDvGw4IB0cmeZRkFmqTrchxMqWP50Gfg1tpHnjdxUCNo0E2qg==}
+
+  '@redocly/openapi-core@1.25.5':
+    resolution: {integrity: sha512-BNgXjqesJu4L5f8F73c2hkkH5IdvjYCKYFgIl+m9oNgqGRIPBJjtiEGOx7jkQ6nElN4311z7Z4aTECtklaaHwg==}
     engines: {node: '>=14.19.0', npm: '>=7.0.0'}
 
   '@rollup/pluginutils@5.1.0':
@@ -4088,83 +3914,83 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.22.2':
-    resolution: {integrity: sha512-8Ao+EDmTPjZ1ZBABc1ohN7Ylx7UIYcjReZinigedTOnGFhIctyGPxY2II+hJ6gD2/vkDKZTyQ0e7++kwv6wDrw==}
+  '@rollup/rollup-android-arm-eabi@4.24.0':
+    resolution: {integrity: sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.22.2':
-    resolution: {integrity: sha512-I+B1v0a4iqdS9DvYt1RJZ3W+Oh9EVWjbY6gp79aAYipIbxSLEoQtFQlZEnUuwhDXCqMxJ3hluxKAdPD+GiluFQ==}
+  '@rollup/rollup-android-arm64@4.24.0':
+    resolution: {integrity: sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.22.2':
-    resolution: {integrity: sha512-BTHO7rR+LC67OP7I8N8GvdvnQqzFujJYWo7qCQ8fGdQcb8Gn6EQY+K1P+daQLnDCuWKbZ+gHAQZuKiQkXkqIYg==}
+  '@rollup/rollup-darwin-arm64@4.24.0':
+    resolution: {integrity: sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.22.2':
-    resolution: {integrity: sha512-1esGwDNFe2lov4I6GsEeYaAMHwkqk0IbuGH7gXGdBmd/EP9QddJJvTtTF/jv+7R8ZTYPqwcdLpMTxK8ytP6k6Q==}
+  '@rollup/rollup-darwin-x64@4.24.0':
+    resolution: {integrity: sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.22.2':
-    resolution: {integrity: sha512-GBHuY07x96OTEM3OQLNaUSUwrOhdMea/LDmlFHi/HMonrgF6jcFrrFFwJhhe84XtA1oK/Qh4yFS+VMREf6dobg==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.24.0':
+    resolution: {integrity: sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.22.2':
-    resolution: {integrity: sha512-Dbfa9Sc1G1lWxop0gNguXOfGhaXQWAGhZUcqA0Vs6CnJq8JW/YOw/KvyGtQFmz4yDr0H4v9X248SM7bizYj4yQ==}
+  '@rollup/rollup-linux-arm-musleabihf@4.24.0':
+    resolution: {integrity: sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.22.2':
-    resolution: {integrity: sha512-Z1YpgBvFYhZIyBW5BoopwSg+t7yqEhs5HCei4JbsaXnhz/eZehT18DaXl957aaE9QK7TRGFryCAtStZywcQe1A==}
+  '@rollup/rollup-linux-arm64-gnu@4.24.0':
+    resolution: {integrity: sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.22.2':
-    resolution: {integrity: sha512-66Zszr7i/JaQ0u/lefcfaAw16wh3oT72vSqubIMQqWzOg85bGCPhoeykG/cC5uvMzH80DQa2L539IqKht6twVA==}
+  '@rollup/rollup-linux-arm64-musl@4.24.0':
+    resolution: {integrity: sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.22.2':
-    resolution: {integrity: sha512-HpJCMnlMTfEhwo19bajvdraQMcAq3FX08QDx3OfQgb+414xZhKNf3jNvLFYKbbDSGBBrQh5yNwWZrdK0g0pokg==}
+  '@rollup/rollup-linux-powerpc64le-gnu@4.24.0':
+    resolution: {integrity: sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.22.2':
-    resolution: {integrity: sha512-/egzQzbOSRef2vYCINKITGrlwkzP7uXRnL+xU2j75kDVp3iPdcF0TIlfwTRF8woBZllhk3QaxNOEj2Ogh3t9hg==}
+  '@rollup/rollup-linux-riscv64-gnu@4.24.0':
+    resolution: {integrity: sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.22.2':
-    resolution: {integrity: sha512-qgYbOEbrPfEkH/OnUJd1/q4s89FvNJQIUldx8X2F/UM5sEbtkqZpf2s0yly2jSCKr1zUUOY1hnTP2J1WOzMAdA==}
+  '@rollup/rollup-linux-s390x-gnu@4.24.0':
+    resolution: {integrity: sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.22.2':
-    resolution: {integrity: sha512-a0lkvNhFLhf+w7A95XeBqGQaG0KfS3hPFJnz1uraSdUe/XImkp/Psq0Ca0/UdD5IEAGoENVmnYrzSC9Y2a2uKQ==}
+  '@rollup/rollup-linux-x64-gnu@4.24.0':
+    resolution: {integrity: sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.22.2':
-    resolution: {integrity: sha512-sSWBVZgzwtsuG9Dxi9kjYOUu/wKW+jrbzj4Cclabqnfkot8Z3VEHcIgyenA3lLn/Fu11uDviWjhctulkhEO60g==}
+  '@rollup/rollup-linux-x64-musl@4.24.0':
+    resolution: {integrity: sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-win32-arm64-msvc@4.22.2':
-    resolution: {integrity: sha512-t/YgCbZ638R/r7IKb9yCM6nAek1RUvyNdfU0SHMDLOf6GFe/VG1wdiUAsxTWHKqjyzkRGg897ZfCpdo1bsCSsA==}
+  '@rollup/rollup-win32-arm64-msvc@4.24.0':
+    resolution: {integrity: sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.22.2':
-    resolution: {integrity: sha512-kTmX5uGs3WYOA+gYDgI6ITkZng9SP71FEMoHNkn+cnmb9Zuyyay8pf0oO5twtTwSjNGy1jlaWooTIr+Dw4tIbw==}
+  '@rollup/rollup-win32-ia32-msvc@4.24.0':
+    resolution: {integrity: sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.22.2':
-    resolution: {integrity: sha512-Yy8So+SoRz8I3NS4Bjh91BICPOSVgdompTIPYTByUqU66AXSIOgmW3Lv1ke3NORPqxdF+RdrZET+8vYai6f4aA==}
+  '@rollup/rollup-win32-x64-msvc@4.24.0':
+    resolution: {integrity: sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==}
     cpu: [x64]
     os: [win32]
 
@@ -4174,61 +4000,61 @@ packages:
     peerDependencies:
       tslib: ^2.6.2
 
-  '@rushstack/node-core-library@4.0.2':
-    resolution: {integrity: sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg==}
+  '@rushstack/node-core-library@5.7.0':
+    resolution: {integrity: sha512-Ff9Cz/YlWu9ce4dmqNBZpA45AEya04XaBFIjV7xTVeEf+y/kTjEasmozqFELXlNG4ROdevss75JrrZ5WgufDkQ==}
     peerDependencies:
       '@types/node': ^18.16.16
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/rig-package@0.5.2':
-    resolution: {integrity: sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==}
+  '@rushstack/rig-package@0.5.3':
+    resolution: {integrity: sha512-olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow==}
 
-  '@rushstack/terminal@0.10.0':
-    resolution: {integrity: sha512-UbELbXnUdc7EKwfH2sb8ChqNgapUOdqcCIdQP4NGxBpTZV2sQyeekuK3zmfQSa/MN+/7b4kBogl2wq0vpkpYGw==}
+  '@rushstack/terminal@0.14.0':
+    resolution: {integrity: sha512-juTKMAMpTIJKudeFkG5slD8Z/LHwNwGZLtU441l/u82XdTBfsP+LbGKJLCNwP5se+DMCT55GB8x9p6+C4UL7jw==}
     peerDependencies:
       '@types/node': ^18.16.16
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/ts-command-line@4.19.1':
-    resolution: {integrity: sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg==}
+  '@rushstack/ts-command-line@4.22.6':
+    resolution: {integrity: sha512-QSRqHT/IfoC5nk9zn6+fgyqOPXHME0BfchII9EUPR19pocsNp/xSbeBCbD3PIR2Lg+Q5qk7OFqk1VhWPMdKHJg==}
 
   '@selderee/plugin-htmlparser2@0.11.0':
     resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==}
 
-  '@sentry-internal/browser-utils@8.31.0':
-    resolution: {integrity: sha512-Bq7TFMhPr1PixRGYkB/6ar9ws7sj224XzQ+hgpz6OxGEc9fQakvD8t/Nn7dp14k3FI/hcBRA6BBvpOKUUuPgGA==}
+  '@sentry-internal/browser-utils@8.33.1':
+    resolution: {integrity: sha512-TW6/r+Gl5jiXv54iK1xZ3mlVgTS/jaBp4vcQ0xGMdgiQ3WchEPcFSeYovL+YHT3tSud0GZqVtDQCz+5i76puqA==}
     engines: {node: '>=14.18'}
 
-  '@sentry-internal/feedback@8.31.0':
-    resolution: {integrity: sha512-R3LcC2IaTe8lgi5AU9h0rMgyVPpaTiMSLRhRlVeQPVmAKCz8pSG/um13q37t0BsXpTaImW9yYQ71Aj6h6IrShQ==}
+  '@sentry-internal/feedback@8.33.1':
+    resolution: {integrity: sha512-qauMRTm3qDaLqZ3ibI03cj4gLF40y0ij65nj+cns6iWxGCtPrO8tjvXFWuQsE7Aye9dGMnBgmv7uN+NTUtC3RA==}
     engines: {node: '>=14.18'}
 
-  '@sentry-internal/replay-canvas@8.31.0':
-    resolution: {integrity: sha512-ConyrhWozx4HluRj0+9teN4XTC1ndXjxMdJQvDnbLFsQhCCEdwUfaZVshV1CFe9T08Bfyjruaw33yR7pDXYktw==}
+  '@sentry-internal/replay-canvas@8.33.1':
+    resolution: {integrity: sha512-nsxTFTPCT10Ty/v6+AiST3+yotGP1sUb8xqfKB9fPnS1hZHFryp0NnEls7xFjBsBbZPU1GpFkzrk/E6JFzixDQ==}
     engines: {node: '>=14.18'}
 
-  '@sentry-internal/replay@8.31.0':
-    resolution: {integrity: sha512-r8hmFDwWxeAxpdzBCRWTKQ/QHl8QanFw8XfM0fvFes/H1d/b43Vwc/IiUnsYoMOdooIP8hJFGDKlfq+Y5uVVGA==}
+  '@sentry-internal/replay@8.33.1':
+    resolution: {integrity: sha512-fm4coIOjmanU29NOVN9MyaP4fUCOYytbtFqVSKRFNZQ/xAgNeySiBIbUd6IjujMmnOk9bY0WEUMcdm3Uotjdog==}
     engines: {node: '>=14.18'}
 
   '@sentry-internal/tracing@7.87.0':
     resolution: {integrity: sha512-HYa0+rfFmYQ/DadXoiuarTSxrcnYDCd/fm0pFuOHjICtfja8IcLegVYP2/r3CgwB+IjquCtJ5kDcqS/NTgUcpA==}
     engines: {node: '>=8'}
 
-  '@sentry/babel-plugin-component-annotate@2.22.4':
-    resolution: {integrity: sha512-hbSq067KwmeKIEkmyzkTNJbmbtx2KRqvpiy9Q/DynI5Z46Nko/ppvgIfyFXK9DelwvEPOqZic4WXTIhO4iv3DA==}
+  '@sentry/babel-plugin-component-annotate@2.22.5':
+    resolution: {integrity: sha512-+93qwB9vTX1nj4hD8AMWowXZsZVkvmP9OwTqSh5d4kOeiJ+dZftUk4+FKeKkAX9lvY2reyHV8Gms5mo67c27RQ==}
     engines: {node: '>= 14'}
 
-  '@sentry/browser@8.31.0':
-    resolution: {integrity: sha512-LZK0uLPGB4Al+qWc1eaad+H/1SR6CY9a0V2XWpUbNAT3+VkEo0Z/78bW1kb43N0cok87hNPOe+c66SfwdxphVQ==}
+  '@sentry/browser@8.33.1':
+    resolution: {integrity: sha512-c6zI/igexkLwZuGk+u8Rj26ChjxGgkhe6ZbKFsXCYaKAp5ep5X7HQRkkqgbxApiqlC0LduHdd/ymzh139JLg8w==}
     engines: {node: '>=14.18'}
 
-  '@sentry/bundler-plugin-core@2.22.4':
-    resolution: {integrity: sha512-25NiyV3v6mdqOXlpzbbJnq0FHdAu1uTEDr+DU8CzNLjIXlq2Sr2CFZ/mhRcR6daM8OAretJdQ34lu0yHUVeE4Q==}
+  '@sentry/bundler-plugin-core@2.22.5':
+    resolution: {integrity: sha512-nfvTthV0aNM9/MwgnCi1WjAlCtau1I4kw6+oZIDOwJRDqGNziz517mYRXSsvCUebtGxDZtPcF7hSEBMSHjpncA==}
     engines: {node: '>= 14'}
 
   '@sentry/cli-darwin@2.36.2':
@@ -4281,8 +4107,8 @@ packages:
     resolution: {integrity: sha512-jkoXqK/nuYh8DYS+n7uaSuSIdw4HJemyRkXsWjAEPtEgD7taGMafZGbP5pl+XE38SE59jTBxmKnkUEZOFMgZGA==}
     engines: {node: '>=8'}
 
-  '@sentry/core@8.31.0':
-    resolution: {integrity: sha512-5zsMBOML18e5a/ZoR5XpcYF59e2kSxb6lTg13u52f/+NA27EPgxKgXim5dz6L/6+0cizgwwmFaZFGJiFc2qoAA==}
+  '@sentry/core@8.33.1':
+    resolution: {integrity: sha512-3SS41suXLFzxL3OQvTMZ6q92ZapELVq2l2SoWlZopcamWhog2Ru0dp2vkunq97kFHb2TzKRTlFH4+4gbT8SJug==}
     engines: {node: '>=14.18'}
 
   '@sentry/integrations@7.87.0':
@@ -4297,24 +4123,24 @@ packages:
     resolution: {integrity: sha512-w8jKFHq/Llupmr2FezmFgQsnm3y/CnqLjb7s6PstI78E409wrhH7p7oqX/OEuzccH1qNCNwes/3QKvPTRQDB4Q==}
     engines: {node: '>=8'}
 
-  '@sentry/types@8.31.0':
-    resolution: {integrity: sha512-prRM/n5nlP+xQZSpdEkSR8BwwZtgsLk0NbI8eCjTMu2isVlrlggop8pVaJb7y9HmElVtDA1Q6y4u8TD2htQKFQ==}
+  '@sentry/types@8.33.1':
+    resolution: {integrity: sha512-GjoAMvwtpIemoF/IiwZ7A60g4nQv3qwzR21GvJqDVUoKD0e8pv9OLX+HyXoUat4wEDGSuDUcUyUKD2G+od73QA==}
     engines: {node: '>=14.18'}
 
   '@sentry/utils@7.87.0':
     resolution: {integrity: sha512-7xgtPTnTNP/4IznFMFXxltuaXfLvzznrYCDMv9ny8EeUjJqlLX3CVA8Qq3YALsLCQCKcrGRARbAcd/EGG//w2w==}
     engines: {node: '>=8'}
 
-  '@sentry/utils@8.31.0':
-    resolution: {integrity: sha512-9W2LZ9QIHKc0HSyH/7UmTolc01Q4vX/qMSZk7i1noinlkQtnRUmTP39r1DSITjKCrDHj6zvB/J1RPDUoRcTXxQ==}
+  '@sentry/utils@8.33.1':
+    resolution: {integrity: sha512-uzuYpiiJuFY3N4WNHMBWUQX5oNv2t/TbG0OHRp3Rr7yeu+HSfD542TIp9/gMZ+G0Cxd8AmVO3wkKIFbk0TL4Qg==}
     engines: {node: '>=14.18'}
 
-  '@sentry/vite-plugin@2.22.4':
-    resolution: {integrity: sha512-C51PUlTv0BXN3+e9SjPHptNX3b9E0clrsaR5c//l/sFkQjuteDHKChA1gNzZSvfoa3gm9NzZAgpk3hVF2O3nBA==}
+  '@sentry/vite-plugin@2.22.5':
+    resolution: {integrity: sha512-dFARM360varU+hdU1MCpl0VTL03FkVIC+A9egCE+ureuOryjVNe3cm2mUjv/gnDHHNTOxWC2H2c8BlOkqTGP/w==}
     engines: {node: '>= 14'}
 
-  '@sentry/vue@8.31.0':
-    resolution: {integrity: sha512-w512J2XLs43OZ7KBcdy4ho+IWMf37TQDJ5+JBONC+OLmGo7rixAZZxwIA7nI1/kZsBYEZ6JZL1uPCMrwwe/BsQ==}
+  '@sentry/vue@8.33.1':
+    resolution: {integrity: sha512-Ec3Z/KM96PhSdc3NSQUkKRETSipnIy55M35ujGCbdMnlGr95TjmInxVIxQGZap8S0EVzcpGCWFTGlzUR/pmVJQ==}
     engines: {node: '>=14.18'}
     peerDependencies:
       vue: 2.x || 3.x
@@ -4353,58 +4179,26 @@ packages:
     resolution: {integrity: sha512-5imgGUlZL4dW4YWdMYAKLmal9ny/tlenM81QZY7xYyb76z9Z/QOg7oM5Ak9HQl8QfFTlGVWwcMXl+54jroRgEQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/abort-controller@2.2.0':
-    resolution: {integrity: sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/abort-controller@3.1.1':
-    resolution: {integrity: sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==}
+  '@smithy/abort-controller@3.1.5':
+    resolution: {integrity: sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/abort-controller@3.1.4':
-    resolution: {integrity: sha512-VupaALAQlXViW3/enTf/f5l5JZYSAxoJL7f0nanhNNKnww6DGCg1oYIuNP78KDugnkwthBO6iEcym16HhWV8RQ==}
+  '@smithy/chunked-blob-reader-native@3.0.0':
+    resolution: {integrity: sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==}
+
+  '@smithy/chunked-blob-reader@3.0.0':
+    resolution: {integrity: sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==}
+
+  '@smithy/config-resolver@3.0.9':
+    resolution: {integrity: sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/chunked-blob-reader-native@2.0.1':
-    resolution: {integrity: sha512-N2oCZRglhWKm7iMBu7S6wDzXirjAofi7tAd26cxmgibRYOBS4D3hGfmkwCpHdASZzwZDD8rluh0Rcqw1JeZDRw==}
-
-  '@smithy/chunked-blob-reader@2.0.0':
-    resolution: {integrity: sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==}
-
-  '@smithy/config-resolver@2.2.0':
-    resolution: {integrity: sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/config-resolver@3.0.5':
-    resolution: {integrity: sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==}
+  '@smithy/core@2.4.8':
+    resolution: {integrity: sha512-x4qWk7p/a4dcf7Vxb2MODIf4OIcqNbK182WxRvZ/3oKPrf/6Fdic5sSElhO1UtXpWKBazWfqg0ZEK9xN1DsuHA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/config-resolver@3.0.8':
-    resolution: {integrity: sha512-Tv1obAC18XOd2OnDAjSWmmthzx6Pdeh63FbLin8MlPiuJ2ATpKkq0NcNOJFr0dO+JmZXnwu8FQxKJ3TKJ3Hulw==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/core@1.4.2':
-    resolution: {integrity: sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/core@2.4.0':
-    resolution: {integrity: sha512-cHXq+FneIF/KJbt4q4pjN186+Jf4ZB0ZOqEaZMBhT79srEyGDDBV31NqBRBjazz8ppQ1bJbDJMY9ba5wKFV36w==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/core@2.4.5':
-    resolution: {integrity: sha512-Z0qlPXgZ0pouYgnu/cZTEYeRAvniiKZmVl4wIbZHX/nEMHkMDV9ao6KFArsU9KndE0TuhL149xcRx45wfw1YCA==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/credential-provider-imds@2.3.0':
-    resolution: {integrity: sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/credential-provider-imds@3.2.0':
-    resolution: {integrity: sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/credential-provider-imds@3.2.3':
-    resolution: {integrity: sha512-VoxMzSzdvkkjMJNE38yQgx4CfnmT+Z+5EUXkg4x7yag93eQkVQgZvN3XBSHC/ylfBbLbAtdu7flTCChX9I+mVg==}
+  '@smithy/credential-provider-imds@3.2.4':
+    resolution: {integrity: sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/eventstream-codec@1.1.0':
@@ -4413,96 +4207,41 @@ packages:
   '@smithy/eventstream-codec@2.2.0':
     resolution: {integrity: sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw==}
 
-  '@smithy/eventstream-codec@3.1.2':
-    resolution: {integrity: sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==}
+  '@smithy/eventstream-codec@3.1.6':
+    resolution: {integrity: sha512-SBiOYPBH+5wOyPS7lfI150ePfGLhnp/eTu5RnV9xvhGvRiKfnl6HzRK9wehBph+il8FxS9KTeadx7Rcmf1GLPQ==}
 
-  '@smithy/eventstream-codec@3.1.5':
-    resolution: {integrity: sha512-6pu+PT2r+5ZnWEV3vLV1DzyrpJ0TmehQlniIDCSpZg6+Ji2SfOI38EqUyQ+O8lotVElCrfVc9chKtSMe9cmCZQ==}
-
-  '@smithy/eventstream-serde-browser@2.2.0':
-    resolution: {integrity: sha512-UaPf8jKbcP71BGiO0CdeLmlg+RhWnlN8ipsMSdwvqBFigl5nil3rHOI/5GE3tfiuX8LvY5Z9N0meuU7Rab7jWw==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/eventstream-serde-browser@3.0.6':
-    resolution: {integrity: sha512-2hM54UWQUOrki4BtsUI1WzmD13/SeaqT/AB3EUJKbcver/WgKNaiJ5y5F5XXuVe6UekffVzuUDrBZVAA3AWRpQ==}
+  '@smithy/eventstream-serde-browser@3.0.10':
+    resolution: {integrity: sha512-1i9aMY6Pl/SmA6NjvidxnfBLHMPzhKu2BP148pEt5VwhMdmXn36PE2kWKGa9Hj8b0XGtCTRucpCncylevCtI7g==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-browser@3.0.9':
-    resolution: {integrity: sha512-PiQLo6OQmZAotJweIcObL1H44gkvuJACKMNqpBBe5Rf2Ax1DOcGi/28+feZI7yTe1ERHlQQaGnm8sSkyDUgsMg==}
+  '@smithy/eventstream-serde-config-resolver@3.0.7':
+    resolution: {integrity: sha512-eVzhGQBPEqXXYHvIUku0jMTxd4gDvenRzUQPTmKVWdRvp9JUCKrbAXGQRYiGxUYq9+cqQckRm0wq3kTWnNtDhw==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-config-resolver@2.2.0':
-    resolution: {integrity: sha512-RHhbTw/JW3+r8QQH7PrganjNCiuiEZmpi6fYUAetFfPLfZ6EkiA08uN3EFfcyKubXQxOwTeJRZSQmDDCdUshaA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/eventstream-serde-config-resolver@3.0.3':
-    resolution: {integrity: sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==}
+  '@smithy/eventstream-serde-node@3.0.9':
+    resolution: {integrity: sha512-JE0Guqvt0xsmfQ5y1EI342/qtJqznBv8cJqkHZV10PwC8GWGU5KNgFbQnsVCcX+xF+qIqwwfRmeWoJCjuOLmng==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-config-resolver@3.0.6':
-    resolution: {integrity: sha512-iew15It+c7WfnVowWkt2a7cdPp533LFJnpjDQgfZQcxv2QiOcyEcea31mnrk5PVbgo0nNH3VbYGq7myw2q/F6A==}
+  '@smithy/eventstream-serde-universal@3.0.9':
+    resolution: {integrity: sha512-bydfgSisfepCufw9kCEnWRxqxJFzX/o8ysXWv+W9F2FIyiaEwZ/D8bBKINbh4ONz3i05QJ1xE7A5OKYvgJsXaw==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-node@2.2.0':
-    resolution: {integrity: sha512-zpQMtJVqCUMn+pCSFcl9K/RPNtQE0NuMh8sKpCdEHafhwRsjP50Oq/4kMmvxSRy6d8Jslqd8BLvDngrUtmN9iA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/fetch-http-handler@3.2.9':
+    resolution: {integrity: sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==}
 
-  '@smithy/eventstream-serde-node@3.0.5':
-    resolution: {integrity: sha512-+upXvnHNyZP095s11jF5dhGw/Ihzqwl5G+/KtMnoQOpdfC3B5HYCcDVG9EmgkhJMXJlM64PyN5gjJl0uXFQehQ==}
+  '@smithy/hash-blob-browser@3.1.6':
+    resolution: {integrity: sha512-BKNcMIaeZ9lB67sgo88iCF4YB35KT8X2dNJ8DqrtZNTgN6tUDYBKThzfGtos/mnZkGkW91AYHisESHmSiYQmKw==}
+
+  '@smithy/hash-node@3.0.7':
+    resolution: {integrity: sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-node@3.0.8':
-    resolution: {integrity: sha512-6m+wI+fT0na+6oao6UqALVA38fsScCpoG5UO/A8ZSyGLnPM2i4MS1cFUhpuALgvLMxfYoTCh7qSeJa0aG4IWpQ==}
+  '@smithy/hash-stream-node@3.1.6':
+    resolution: {integrity: sha512-sFSSt7cmCpFWZPfVx7k80Bgb1K2VJ27VmMxH8X+dDhp7Wv8IBgID4K2VK5ehMJROF8hQgcj4WywnkHIwX/xlwQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/eventstream-serde-universal@2.2.0':
-    resolution: {integrity: sha512-pvoe/vvJY0mOpuF84BEtyZoYfbehiFj8KKWk1ds2AT0mTLYFVs+7sBJZmioOFdBXKd48lfrx1vumdPdmGlCLxA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/eventstream-serde-universal@3.0.5':
-    resolution: {integrity: sha512-5u/nXbyoh1s4QxrvNre9V6vfyoLWuiVvvd5TlZjGThIikc3G+uNiG9uOTCWweSRjv1asdDIWK7nOmN7le4RYHQ==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/eventstream-serde-universal@3.0.8':
-    resolution: {integrity: sha512-09tqzIQ6e+7jLqGvRji1yJoDbL/zob0OFhq75edgStWErGLf16+yI5hRc/o9/YAybOhUZs/swpW2SPn892G5Gg==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/fetch-http-handler@2.5.0':
-    resolution: {integrity: sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw==}
-
-  '@smithy/fetch-http-handler@3.2.4':
-    resolution: {integrity: sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg==}
-
-  '@smithy/fetch-http-handler@3.2.8':
-    resolution: {integrity: sha512-Lqe0B8F5RM7zkw//6avq1SJ8AfaRd3ubFUS1eVp5WszV7p6Ne5hQ4dSuMHDpNRPhgTvj4va9Kd/pcVigHEHRow==}
-
-  '@smithy/hash-blob-browser@2.0.16':
-    resolution: {integrity: sha512-cSYRi05LA7DZDwjB1HL0BP8B56eUNNeLglVH147QTXFyuXJq/7erAIiLRfsyXB8+GfFHkSS5BHbc76a7k/AYPA==}
-
-  '@smithy/hash-node@2.2.0':
-    resolution: {integrity: sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/hash-node@3.0.3':
-    resolution: {integrity: sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/hash-node@3.0.6':
-    resolution: {integrity: sha512-c/FHEdKK/7DU2z6ZE91L36ahyXWayR3B+FzELjnYq7wH5YqIseM24V+pWCS9kFn1Ln8OFGTf+pyYPiHZuX0s/Q==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/hash-stream-node@2.0.17':
-    resolution: {integrity: sha512-ey8DtnATzp1mOXgS7rqMwSmAki6iJA+jgNucKcxRkhMB1rrICfHg+rhmIF50iLPDHUhTcS5pBMOrLzzpZftvNQ==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/invalid-dependency@2.2.0':
-    resolution: {integrity: sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q==}
-
-  '@smithy/invalid-dependency@3.0.3':
-    resolution: {integrity: sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==}
-
-  '@smithy/invalid-dependency@3.0.6':
-    resolution: {integrity: sha512-czM7Ioq3s8pIXht7oD+vmgy4Wfb4XavU/k/irO8NdXFFOx7YAlsCCcKOh/lJD1mJSYQqiR7NmpZ9JviryD/7AQ==}
+  '@smithy/invalid-dependency@3.0.7':
+    resolution: {integrity: sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA==}
 
   '@smithy/is-array-buffer@1.1.0':
     resolution: {integrity: sha512-twpQ/n+3OWZJ7Z+xu43MJErmhB/WO/mMTnqR6PwWQShvSJ/emx5d1N59LQZk6ZpTAeuRWrc+eHhkzTp9NFjNRQ==}
@@ -4516,107 +4255,43 @@ packages:
     resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/md5-js@2.0.17':
-    resolution: {integrity: sha512-jmISTCnEkOnm2oCNx/rMkvBT/eQh3aA6nktevkzbmn/VYqYEuc5Z2n5sTTqsciMSO01Lvf56wG1A4twDqovYeQ==}
+  '@smithy/md5-js@3.0.7':
+    resolution: {integrity: sha512-+wco9IN9uOW4tNGkZIqTR6IXyfO7Z8A+IOq82QCRn/f/xcmt7H1fXwmQVbfDSvbeFwfNnhv7s+u0G9PzPG6o2w==}
 
-  '@smithy/middleware-content-length@2.2.0':
-    resolution: {integrity: sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/middleware-content-length@3.0.5':
-    resolution: {integrity: sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw==}
+  '@smithy/middleware-content-length@3.0.9':
+    resolution: {integrity: sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-content-length@3.0.8':
-    resolution: {integrity: sha512-VuyszlSO49WKh3H9/kIO2kf07VUwGV80QRiaDxUfP8P8UKlokz381ETJvwLhwuypBYhLymCYyNhB3fLAGBX2og==}
+  '@smithy/middleware-endpoint@3.1.4':
+    resolution: {integrity: sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-endpoint@2.5.1':
-    resolution: {integrity: sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/middleware-endpoint@3.1.0':
-    resolution: {integrity: sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw==}
+  '@smithy/middleware-retry@3.0.23':
+    resolution: {integrity: sha512-x9PbGXxkcXIpm6L26qRSCC+eaYcHwybRmqU8LO/WM2RRlW0g8lz6FIiKbKgGvHuoK3dLZRiQVSQJveiCzwnA5A==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-endpoint@3.1.3':
-    resolution: {integrity: sha512-KeM/OrK8MVFUsoJsmCN0MZMVPjKKLudn13xpgwIMpGTYpA8QZB2Xq5tJ+RE6iu3A6NhOI4VajDTwBsm8pwwrhg==}
+  '@smithy/middleware-serde@3.0.7':
+    resolution: {integrity: sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-retry@2.3.1':
-    resolution: {integrity: sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/middleware-retry@3.0.15':
-    resolution: {integrity: sha512-iTMedvNt1ApdvkaoE8aSDuwaoc+BhvHqttbA/FO4Ty+y/S5hW6Ci/CTScG7vam4RYJWZxdTElc3MEfHRVH6cgQ==}
+  '@smithy/middleware-stack@3.0.7':
+    resolution: {integrity: sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/middleware-retry@3.0.20':
-    resolution: {integrity: sha512-HELCOVwYw5hFDBm69d+LmmGjBCjWnwp/t7SJiHmp+c4u9vgfIaCjdSeIdnlOsLrr5ic5jGTJXvJFUQnd987b/g==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/middleware-serde@2.3.0':
-    resolution: {integrity: sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/middleware-serde@3.0.3':
-    resolution: {integrity: sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/middleware-serde@3.0.6':
-    resolution: {integrity: sha512-KKTUSl1MzOM0MAjGbudeaVNtIDo+PpekTBkCNwvfZlKndodrnvRo+00USatiyLOc0ujjO9UydMRu3O9dYML7ag==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/middleware-stack@2.2.0':
-    resolution: {integrity: sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/middleware-stack@3.0.3':
-    resolution: {integrity: sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/middleware-stack@3.0.6':
-    resolution: {integrity: sha512-2c0eSYhTQ8xQqHMcRxLMpadFbTXg6Zla5l0mwNftFCZMQmuhI7EbAJMx6R5eqfuV3YbJ3QGyS3d5uSmrHV8Khg==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/node-config-provider@2.3.0':
-    resolution: {integrity: sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/node-config-provider@3.1.4':
-    resolution: {integrity: sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/node-config-provider@3.1.7':
-    resolution: {integrity: sha512-g3mfnC3Oo8pOI0dYuPXLtdW1WGVb3bR2tkV21GNkm0ZvQjLTtamXAwCWt/FCb0HGvKt3gHHmF1XerG0ICfalOg==}
+  '@smithy/node-config-provider@3.1.8':
+    resolution: {integrity: sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/node-http-handler@1.1.0':
     resolution: {integrity: sha512-d3kRriEgaIiGXLziAM8bjnaLn1fthCJeTLZIwEIpzQqe6yPX0a+yQoLCTyjb2fvdLwkMoG4p7THIIB5cj5lkbg==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/node-http-handler@2.5.0':
-    resolution: {integrity: sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/node-http-handler@3.1.4':
-    resolution: {integrity: sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==}
+  '@smithy/node-http-handler@3.2.4':
+    resolution: {integrity: sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/node-http-handler@3.2.3':
-    resolution: {integrity: sha512-/gcm5DJ3k1b1zEInzBGAZC8ntJ+jwrz1NcSIu+9dSXd1FfG0G6QgkDI40tt8/WYUbHtLyo8fEqtm2v29koWo/w==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/property-provider@2.2.0':
-    resolution: {integrity: sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/property-provider@3.1.3':
-    resolution: {integrity: sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/property-provider@3.1.6':
-    resolution: {integrity: sha512-NK3y/T7Q/Bw+Z8vsVs9MYIQ5v7gOX7clyrXcwhhIBQhbPgRl6JDrZbusO9qWDhcEus75Tg+VCxtIRfo3H76fpw==}
+  '@smithy/property-provider@3.1.7':
+    resolution: {integrity: sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/protocol-http@1.2.0':
@@ -4627,64 +4302,28 @@ packages:
     resolution: {integrity: sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/protocol-http@4.1.0':
-    resolution: {integrity: sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/protocol-http@4.1.3':
-    resolution: {integrity: sha512-GcbMmOYpH9iRqtC05RbRnc/0FssxSTHlmaNhYBTgSgNCYpdR3Kt88u5GAZTBmouzv+Zlj/VRv92J9ruuDeJuEw==}
+  '@smithy/protocol-http@4.1.4':
+    resolution: {integrity: sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/querystring-builder@1.1.0':
     resolution: {integrity: sha512-gDEi4LxIGLbdfjrjiY45QNbuDmpkwh9DX4xzrR2AzjjXpxwGyfSpbJaYhXARw9p17VH0h9UewnNQXNwaQyYMDA==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/querystring-builder@2.2.0':
-    resolution: {integrity: sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/querystring-builder@3.0.3':
-    resolution: {integrity: sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==}
+  '@smithy/querystring-builder@3.0.7':
+    resolution: {integrity: sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/querystring-builder@3.0.6':
-    resolution: {integrity: sha512-sQe08RunoObe+Usujn9+R2zrLuQERi3CWvRO3BvnoWSYUaIrLKuAIeY7cMeDax6xGyfIP3x/yFWbEKSXvOnvVg==}
+  '@smithy/querystring-parser@3.0.7':
+    resolution: {integrity: sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/querystring-parser@2.2.0':
-    resolution: {integrity: sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/querystring-parser@3.0.3':
-    resolution: {integrity: sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==}
+  '@smithy/service-error-classification@3.0.7':
+    resolution: {integrity: sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/querystring-parser@3.0.6':
-    resolution: {integrity: sha512-UJKw4LlEkytzz2Wq+uIdHf6qOtFfee/o7ruH0jF5I6UAuU+19r9QV7nU3P/uI0l6+oElRHmG/5cBBcGJrD7Ozg==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/service-error-classification@2.1.5':
-    resolution: {integrity: sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/service-error-classification@3.0.3':
-    resolution: {integrity: sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/service-error-classification@3.0.6':
-    resolution: {integrity: sha512-53SpchU3+DUZrN7J6sBx9tBiCVGzsib2e4sc512Q7K9fpC5zkJKs6Z9s+qbMxSYrkEkle6hnMtrts7XNkMJJMg==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/shared-ini-file-loader@2.4.0':
-    resolution: {integrity: sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/shared-ini-file-loader@3.1.4':
-    resolution: {integrity: sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/shared-ini-file-loader@3.1.7':
-    resolution: {integrity: sha512-IA4K2qTJYXkF5OfVN4vsY1hfnUZjaslEE8Fsr/gGFza4TAC2A9NfnZuSY2srQIbt9bwtjHiAayrRVgKse4Q7fA==}
+  '@smithy/shared-ini-file-loader@3.1.8':
+    resolution: {integrity: sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/signature-v4@1.1.0':
@@ -4695,24 +4334,12 @@ packages:
     resolution: {integrity: sha512-j5fHgL1iqKTsKJ1mTcw88p0RUcidDu95AWSeZTgiYJb+QcfwWU/UpBnaqiB59FNH5MiAZuSbOBnZlwzeeY2tIw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/signature-v4@4.1.0':
-    resolution: {integrity: sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag==}
+  '@smithy/signature-v4@4.2.0':
+    resolution: {integrity: sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/signature-v4@4.1.4':
-    resolution: {integrity: sha512-72MiK7xYukNsnLJI9NqvUHqTu0ziEsfMsYNlWpiJfuGQnCTFKpckThlEatirvcA/LmT1h7rRO+pJD06PYsPu9Q==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/smithy-client@2.5.1':
-    resolution: {integrity: sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/smithy-client@3.2.0':
-    resolution: {integrity: sha512-pDbtxs8WOhJLJSeaF/eAbPgXg4VVYFlRcL/zoNYA5WbG3wBL06CHtBSg53ppkttDpAJ/hdiede+xApip1CwSLw==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/smithy-client@3.3.4':
-    resolution: {integrity: sha512-NKw/2XxOW/Rg3rzB90HxsmGok5oS6vRzJgMh/JN4BHaOQQ4q5OuX999GmOGxEp730wbpIXIowfKZmIMXkG4v0Q==}
+  '@smithy/smithy-client@3.4.0':
+    resolution: {integrity: sha512-nOfJ1nVQsxiP6srKt43r2My0Gp5PLWCW2ASqUioxIiGmu6d32v4Nekidiv5qOmmtzIrmaD+ADX5SKHUuhReeBQ==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/types@1.2.0':
@@ -4723,41 +4350,20 @@ packages:
     resolution: {integrity: sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/types@3.3.0':
-    resolution: {integrity: sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==}
+  '@smithy/types@3.5.0':
+    resolution: {integrity: sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/types@3.4.2':
-    resolution: {integrity: sha512-tHiFcfcVedVBHpmHUEUHOCCih8iZbIAYn9NvPsNzaPm/237I3imdDdZoOC8c87H5HBAVEa06tTgb+OcSWV9g5w==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/url-parser@2.2.0':
-    resolution: {integrity: sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ==}
-
-  '@smithy/url-parser@3.0.3':
-    resolution: {integrity: sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==}
-
-  '@smithy/url-parser@3.0.6':
-    resolution: {integrity: sha512-47Op/NU8Opt49KyGpHtVdnmmJMsp2hEwBdyjuFB9M2V5QVOwA7pBhhxKN5z6ztKGrMw76gd8MlbPuzzvaAncuQ==}
-
-  '@smithy/util-base64@2.3.0':
-    resolution: {integrity: sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/url-parser@3.0.7':
+    resolution: {integrity: sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA==}
 
   '@smithy/util-base64@3.0.0':
     resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/util-body-length-browser@2.2.0':
-    resolution: {integrity: sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w==}
-
   '@smithy/util-body-length-browser@3.0.0':
     resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==}
 
-  '@smithy/util-body-length-node@2.3.0':
-    resolution: {integrity: sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw==}
-    engines: {node: '>=14.0.0'}
-
   '@smithy/util-body-length-node@3.0.0':
     resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==}
     engines: {node: '>=16.0.0'}
@@ -4774,48 +4380,20 @@ packages:
     resolution: {integrity: sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/util-config-provider@2.3.0':
-    resolution: {integrity: sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ==}
-    engines: {node: '>=14.0.0'}
-
   '@smithy/util-config-provider@3.0.0':
     resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/util-defaults-mode-browser@2.2.1':
-    resolution: {integrity: sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw==}
+  '@smithy/util-defaults-mode-browser@3.0.23':
+    resolution: {integrity: sha512-Y07qslyRtXDP/C5aWKqxTPBl4YxplEELG3xRrz2dnAQ6Lq/FgNrcKWmV561nNaZmFH+EzeGOX3ZRMbU8p1T6Nw==}
     engines: {node: '>= 10.0.0'}
 
-  '@smithy/util-defaults-mode-browser@3.0.15':
-    resolution: {integrity: sha512-FZ4Psa3vjp8kOXcd3HJOiDPBCWtiilLl57r0cnNtq/Ga9RSDrM5ERL6xt+tO43+2af6Pn5Yp92x2n5vPuduNfg==}
+  '@smithy/util-defaults-mode-node@3.0.23':
+    resolution: {integrity: sha512-9Y4WH7f0vnDGuHUa4lGX9e2p+sMwODibsceSV6rfkZOvMC+BY3StB2LdO1NHafpsyHJLpwAgChxQ38tFyd6vkg==}
     engines: {node: '>= 10.0.0'}
 
-  '@smithy/util-defaults-mode-browser@3.0.20':
-    resolution: {integrity: sha512-HpYmCpEThQJpCKzwzrGrklhdegRfuXI9keHRrHidbyEMliCdgic6t38MikJeZEkdIcEMhO1g95HIYMzjUzB+xg==}
-    engines: {node: '>= 10.0.0'}
-
-  '@smithy/util-defaults-mode-node@2.3.1':
-    resolution: {integrity: sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA==}
-    engines: {node: '>= 10.0.0'}
-
-  '@smithy/util-defaults-mode-node@3.0.15':
-    resolution: {integrity: sha512-KSyAAx2q6d0t6f/S4XB2+3+6aQacm3aLMhs9aLMqn18uYGUepbdssfogW5JQZpc6lXNBnp0tEnR5e9CEKmEd7A==}
-    engines: {node: '>= 10.0.0'}
-
-  '@smithy/util-defaults-mode-node@3.0.20':
-    resolution: {integrity: sha512-atdsHNtAX0rwTvRRGsrONU0C0XzapH6tI8T1y/OReOvWN7uBwXqqWRft6m8egU2DgeReU0xqT3PHdGCe5VRaaQ==}
-    engines: {node: '>= 10.0.0'}
-
-  '@smithy/util-endpoints@1.2.0':
-    resolution: {integrity: sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ==}
-    engines: {node: '>= 14.0.0'}
-
-  '@smithy/util-endpoints@2.0.5':
-    resolution: {integrity: sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/util-endpoints@2.1.2':
-    resolution: {integrity: sha512-FEISzffb4H8DLzGq1g4MuDpcv6CIG15fXoQzDH9SjpRJv6h7J++1STFWWinilG0tQh9H1v2UKWG19Jjr2B16zQ==}
+  '@smithy/util-endpoints@2.1.3':
+    resolution: {integrity: sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/util-hex-encoding@1.1.0':
@@ -4838,36 +4416,16 @@ packages:
     resolution: {integrity: sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw==}
     engines: {node: '>=14.0.0'}
 
-  '@smithy/util-middleware@3.0.3':
-    resolution: {integrity: sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==}
+  '@smithy/util-middleware@3.0.7':
+    resolution: {integrity: sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/util-middleware@3.0.6':
-    resolution: {integrity: sha512-BxbX4aBhI1O9p87/xM+zWy0GzT3CEVcXFPBRDoHAM+pV0eSW156pR+PSYEz0DQHDMYDsYAflC2bQNz2uaDBUZQ==}
+  '@smithy/util-retry@3.0.7':
+    resolution: {integrity: sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/util-retry@2.2.0':
-    resolution: {integrity: sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g==}
-    engines: {node: '>= 14.0.0'}
-
-  '@smithy/util-retry@3.0.3':
-    resolution: {integrity: sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/util-retry@3.0.6':
-    resolution: {integrity: sha512-BRZiuF7IwDntAbevqMco67an0Sr9oLQJqqRCsSPZZHYRnehS0LHDAkJk/pSmI7Z8c/1Vet294H7fY2fWUgB+Rg==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/util-stream@2.2.0':
-    resolution: {integrity: sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/util-stream@3.1.3':
-    resolution: {integrity: sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw==}
-    engines: {node: '>=16.0.0'}
-
-  '@smithy/util-stream@3.1.8':
-    resolution: {integrity: sha512-hoKOqSmb8FD3WLObuB5hwbM7bNIWgcnvkThokTvVq7J5PKjlLUK5qQQcB9zWLHIoSaIlf3VIv2OxZY2wtQjcRQ==}
+  '@smithy/util-stream@3.1.9':
+    resolution: {integrity: sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ==}
     engines: {node: '>=16.0.0'}
 
   '@smithy/util-uri-escape@1.1.0':
@@ -4894,108 +4452,104 @@ packages:
     resolution: {integrity: sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/util-waiter@2.0.15':
-    resolution: {integrity: sha512-9Y+btzzB7MhLADW7xgD6SjvmoYaRkrb/9SCbNGmNdfO47v38rxb90IGXyDtAK0Shl9bMthTmLgjlfYc+vtz2Qw==}
-    engines: {node: '>=14.0.0'}
-
-  '@smithy/util-waiter@3.1.2':
-    resolution: {integrity: sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==}
+  '@smithy/util-waiter@3.1.6':
+    resolution: {integrity: sha512-xs/KAwWOeCklq8aMlnpk25LgxEYHKOEodfjfKclDMLcBJEVEKzDLxZxBQyztcuPJ7F54213NJS8PxoiHNMdItQ==}
     engines: {node: '>=16.0.0'}
 
   '@sqltools/formatter@1.2.5':
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
 
-  '@storybook/addon-a11y@8.3.1':
-    resolution: {integrity: sha512-/Xu0v6kk2xugXdB4EJCbrVZDEt/rtJwHDb+MHhxsxp2FYF/ZRDKHinJzyUMMM4BIoJVZQ8BgFjp7P1hprS7yug==}
+  '@storybook/addon-a11y@8.3.5':
+    resolution: {integrity: sha512-/19UO8IXbyfcYK5K8ejSYF+hC+EK79c0bBPHMNeYSFOHSqQM3KoMo+TLIcLsuhuRClmlM+4Zs+VSIYDwc+d3ig==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-actions@8.3.1':
-    resolution: {integrity: sha512-f00NxBNBcsMHqtwsOpRbZKrNMLdUjnSg1G6zYdVxAG7NwxzgpqPZm37I36ebFmgz/WO2XQ3ihxzfV2IKFuiZ6g==}
+  '@storybook/addon-actions@8.3.5':
+    resolution: {integrity: sha512-t8D5oo+4XfD+F8091wLa2y/CDd/W2lExCeol5Vm1tp5saO+u6f2/d7iykLhTowWV84Uohi3D073uFeyTAlGebg==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-backgrounds@8.3.1':
-    resolution: {integrity: sha512-HPQElHIi5SMWJTOimYt27QaiPrrwTprVShVfq3gQKpUcDJhT4qMpI3Bn3JCtthPlXlUA+miZcNdNRTIc2XzhSA==}
+  '@storybook/addon-backgrounds@8.3.5':
+    resolution: {integrity: sha512-IQGjDujuw8+iSqKREdkL8I5E/5CAHZbfOWd4A75PQK2D6qZ0fu/xRwTOQOH4jP6xn/abvfACOdL6A0d5bU90ag==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-controls@8.3.1':
-    resolution: {integrity: sha512-zqVNRGQ2GS1ReDZ6YTAl+pLmnrOWwE3OUsByRfzHCYlmO55TxYi92HBTSbAXyWRKyqVUKH69PmbKGukc83aX2Q==}
+  '@storybook/addon-controls@8.3.5':
+    resolution: {integrity: sha512-2eCVobUUvY1Rq7sp1U8Mx8t44VXwvi0E+hqyrsqOx5TTSC/FUQ+hNAX6GSYUcFIyQQ1ORpKNlUjAAdjxBv1ZHQ==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-docs@8.3.1':
-    resolution: {integrity: sha512-8ES7ThajpKDoMheAthnDDg/lXUsIxzV+EdHuE4WnRoiw+25XfYr9WIEuEpytRz/drouJhunOgOJV0kCPxZ3XgQ==}
+  '@storybook/addon-docs@8.3.5':
+    resolution: {integrity: sha512-MOVfo1bY8kXTzbvmWnx3UuSO4WNykFz7Edvb3mxltNyuW7UDRZGuIuSe32ddT/EtLJfurrC9Ja3yBy4KBUGnMA==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-essentials@8.3.1':
-    resolution: {integrity: sha512-5dNlKKJveBYqe1OT4dSE7V7ZjhULWnL238oeHz6wabjfL/l7W9MgLke5mxir4xSaAKf5sOg+QFK+RSmYYih4pg==}
+  '@storybook/addon-essentials@8.3.5':
+    resolution: {integrity: sha512-hXTtPuN4/IsXjUrkMPAuz1qKAl8DovdXpjQgjQs7jSAVx3kc4BZaGqJ3gaVenKtO8uDchmA92BoQygpkc8eWhw==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-highlight@8.3.1':
-    resolution: {integrity: sha512-hEB4O1a76SGEJypjPwjvBT8e9+pWptAD6VY995gtsOrMLaV0213DJV8aEGJRXhELEk2sr8WUaoYhzxxtgD97KA==}
+  '@storybook/addon-highlight@8.3.5':
+    resolution: {integrity: sha512-ku0epul9aReCR3Gv/emwYnsqg3vgux5OmYMjoDcJC7s+LyfweSzLV/f5t9gSHazikJElh5TehtVkWbC4QfbGSw==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-interactions@8.3.1':
-    resolution: {integrity: sha512-EQiemx7ZvI9r4WrWmKB7hvoh9XO+YJh61LNEBLrdnSnRITJKGFrJtqnfuSrvQXWxFVi6U1PtSqDzCV8z0IwK2g==}
+  '@storybook/addon-interactions@8.3.5':
+    resolution: {integrity: sha512-GtTy/A+mG7vDOahQr2avT4dpWtCRiFDSYcWyuQOZm10y8VDDw157HQM+FuhxjV9Owrrohy9F24oBUwRG8H3b5A==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-links@8.3.1':
-    resolution: {integrity: sha512-xhd1cXpHKn9mr87ImcEOV+YexDZcITzxFQoW2m5ocGkMyVFotK6NjOk/f9xsZAGIp4T7axsdEmwFNSovHgw91A==}
+  '@storybook/addon-links@8.3.5':
+    resolution: {integrity: sha512-giRCpn6cfJMYPnVJkojoQDO5ae6098fgY9YgAhwaJej/9dufNcioFdbiyfK1vyzbG6TGeTmJ9ncWCXgWRtzxPQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.3.1
+      storybook: ^8.3.5
     peerDependenciesMeta:
       react:
         optional: true
 
-  '@storybook/addon-measure@8.3.1':
-    resolution: {integrity: sha512-XL7Rph0K0vggVcY7mxGws9SNzLJlCvzrPJdz1xZBKBLLd0fdpbR5Y+1oP1w/7qhZ9Xrg44VRVs4yUzCYUeK2OQ==}
+  '@storybook/addon-measure@8.3.5':
+    resolution: {integrity: sha512-6GVehgbHhFIFS69xSfRV+12VK0cnuIAtZdp1J3eUCc2ATrcigqVjTM6wzZz6kBuX6O3dcusr7Wg46KtNliqLqg==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-outline@8.3.1':
-    resolution: {integrity: sha512-bpxiffkMjWbrVAmbonzkGaTQp3zCECOP5B4Uw0oRfH7YVZgUsj1brRjVsMvBB1bwDP/ijj46X12OcZjqVEJP5Q==}
+  '@storybook/addon-outline@8.3.5':
+    resolution: {integrity: sha512-dwmK6GzjEnQP9Yo0VnBUQtJkXZlXdfjWyskZ/IlUVc+IFdeeCtIiMyA92oMfHo8eXt0k1g21ZqMaIn7ZltOuHw==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-themes@8.3.1':
-    resolution: {integrity: sha512-ovMwopFJu+RsmHZIrBQZmNjwJ6vKI5yaaqb1+PbwR6xc7YwLCVU2RvceTNLpQMkOYPVsjUwyIqBX3FHyOOacvQ==}
+  '@storybook/addon-themes@8.3.5':
+    resolution: {integrity: sha512-kXHKAZvAtMoOR1XFGTo5/T8anE9x7W8Ddpof2wyi+du5HscFiEW7TesWdvNgBUR7wAaiR21aW2S4jC72a6gTCw==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-toolbars@8.3.1':
-    resolution: {integrity: sha512-bjlQP9a56O4OCI4g9tDNm51frBcHaFpHma3MJ1vg302oj/XOQrec/am2sA0E6L1l4Hih2PkRYTamo3+GmQRJug==}
+  '@storybook/addon-toolbars@8.3.5':
+    resolution: {integrity: sha512-Ml2gc9q8WbteDvmuAZGgBxt5SqWMXzuTkMjlsA8EB53hlkN1w9esX4s8YtBeNqC3HKoUzcdq8uexSBqU8fDbSA==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/addon-viewport@8.3.1':
-    resolution: {integrity: sha512-Z0Ls3ThjOx56KE4I5ampOtfK7G4/AAa0bOoaFq7+bLOomXMtZsC3yyXyrm5YQ6ZHmeP2XaXmOe52HDsvq+ko2Q==}
+  '@storybook/addon-viewport@8.3.5':
+    resolution: {integrity: sha512-FSWydoPiVWFXEittG7O1YgvuaqoU9Vb+qoq9XfP/hvQHHMDcMZvC40JaV8AnJeTXaM7ngIjcn9XDEfGbFfOzXw==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/blocks@8.3.1':
-    resolution: {integrity: sha512-/wNLRVWR/edzHQAFvSW68VxHYmBcfXpL/XdO46I5Z1X/tXUd0rtgGZmliQ2jZ242FqxcT8guqqFGehbeYUns5w==}
+  '@storybook/blocks@8.3.5':
+    resolution: {integrity: sha512-8cHTdTywolTHlgwN8I7YH7saWAIjGzV617AwjhJ95AKlC0VtpO1gAFcAgCqr4DU9eMc+LZuvbnaU/RSvA5eCCQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.3.1
+      storybook: ^8.3.5
     peerDependenciesMeta:
       react:
         optional: true
       react-dom:
         optional: true
 
-  '@storybook/builder-vite@8.3.1':
-    resolution: {integrity: sha512-IxfgIuQo9R+zcwoBE85PkCSKWGbPVStJgm1VHO/mixIdZExanbAhDS+L21nAZCelTvcsObTN76BN953v2LjVGg==}
+  '@storybook/builder-vite@8.3.5':
+    resolution: {integrity: sha512-paGX8tEmAeAKFU5Cnwkq3RAi3LFCnmjAxMJikT09jUi6jDpNa0VzH8jbLxKdjsPMAsz0Wv3mrLvL2b8hyxLWAw==}
     peerDependencies:
       '@preact/preset-vite': '*'
-      storybook: ^8.3.1
+      storybook: ^8.3.5
       typescript: ^5.6.2
       vite: ^4.0.0 || ^5.0.0
       vite-plugin-glimmerx: '*'
@@ -5007,18 +4561,18 @@ packages:
       vite-plugin-glimmerx:
         optional: true
 
-  '@storybook/components@8.3.1':
-    resolution: {integrity: sha512-/CMqX40CpNOKow58oLyO/OvMhHiHCIvOGf/65lXHk/D9qECMvchFfA2/MH8H7HiJUIqoSPit194miBENK5kqdw==}
+  '@storybook/components@8.3.5':
+    resolution: {integrity: sha512-Rq28YogakD3FO4F8KwAtGpo1g3t4V/gfCLqTQ8B6oQUFoxLqegkWk/DlwCzvoJndXuQJfdSyM6+r1JcA4Nql5A==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/core@8.3.1':
-    resolution: {integrity: sha512-L8YTtUipcBvl4F8jFNnXU3NM1hnLwZ3Ge2l+SRVKUGoAZzdf/I8O/0eOeZ+3LM3PvDn8bC9x+qjhNyDgtT+ieQ==}
+  '@storybook/core@8.3.5':
+    resolution: {integrity: sha512-GOGfTvdioNa/n+Huwg4u/dsyYyBcM+gEcdxi3B7i5x4yJ3I912KoVshumQAOF2myKSRdI8h8aGWdx7nnjd0+5Q==}
 
-  '@storybook/csf-plugin@8.3.1':
-    resolution: {integrity: sha512-K3JWJf79+BkJAbOnAns5KGQ9h0NCqWht/1B05frj9LuAD/U+0sikpByiC2QvJ+qtX4fODhqjRYvrv2jgP8o3mA==}
+  '@storybook/csf-plugin@8.3.5':
+    resolution: {integrity: sha512-ODVqNXwJt90hG7QW8I9w/XUyOGlr0l7XltmIJgXwB/2cYDvaGu3JV5Ybg7O0fxPV8uXk7JlRuUD8ZYv5Low6pA==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
   '@storybook/csf@0.1.11':
     resolution: {integrity: sha512-dHYFQH3mA+EtnCkHXzicbLgsvzYjcDJ1JWsogbItZogkPHgSJM/Wr71uMkcvw8v9mmCyP4NpXJuu6bPoVsOnzg==}
@@ -5033,50 +4587,50 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/instrumenter@8.3.1':
-    resolution: {integrity: sha512-TtECvALgEPLafdy+YHXz2+xBPobiSMHj532nS7tkqxD9aRD1+Ocy6pWWNaP9+iiWWnHIWlTQ0M/7UEoCxV+Ksg==}
+  '@storybook/instrumenter@8.3.5':
+    resolution: {integrity: sha512-NLDXai5y2t1ITgHVK9chyL0rMFZbICCOGcnTbyWhkLbiEWZKPJ8FuB8+g+Ba6zwtCve1A1Cnb4O2LOWy7TgWQw==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/manager-api@8.3.1':
-    resolution: {integrity: sha512-GHJr1/nNAfkzNs4P8z31zBN8ZBucMfl+aSH6ciCy12jN3dOmEfb67mx3aes2PmBJjY3K8HG2lgsO9tNKIyDJXQ==}
+  '@storybook/manager-api@8.3.5':
+    resolution: {integrity: sha512-fEQoKKi7h7pzh2z9RfuzatJxubrsfL/CB99fNXQ0wshMSY/7O4ckd18pK4fzG9ErnCtLAO9qsim4N/4eQC+/8Q==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/preview-api@8.3.1':
-    resolution: {integrity: sha512-mpeeQi0DiK6lGiFEa/iAXNQykZB/wv9UiI5MYwxfgVTCCIh7skeBQsu/7Ye+C+KyXgrNmH5YAP3CjYfkFVimhQ==}
+  '@storybook/preview-api@8.3.5':
+    resolution: {integrity: sha512-VPqpudE8pmjTLvdNJoW/2//nqElDgUOmIn3QxbbCmdZTHDg5tFtxuqwdlNfArF0TxvTSBDIulXt/Q6K56TAfTg==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/react-dom-shim@8.3.1':
-    resolution: {integrity: sha512-nHMhXkt3FAm8c08QTTU70vpYhsAu65RpCv/uhYZ89H5OWvmLFHn36iJQPzlpWFtJHJ5+bAV/bfgNODR3BV1gRg==}
+  '@storybook/react-dom-shim@8.3.5':
+    resolution: {integrity: sha512-Hf0UitJ/K0C7ajooooUK/PxOR4ihUWqsC7iCV1Gqth8U37dTeLMbaEO4PBwu0VQ+Ufg0N8BJLWfg7o6G4hrODw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/test@8.3.1':
-    resolution: {integrity: sha512-/ZZFZHr+jsO7oBrLFrrCkgkJrh1/AgHBqO8QR0zdTiR0NK0vo2l9v9FXat/VFhSaYTIpVU/NQdNKiPGTKIfAVw==}
+  '@storybook/test@8.3.5':
+    resolution: {integrity: sha512-1BXWsUGWk9FiKKelZZ55FDJdeoL8uRBHbjTYBRM2xJLhdNSvGzI4Tb3bkmxPpGn72Ua6AyldhlTxr2BpUFKOHA==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/theming@8.3.1':
-    resolution: {integrity: sha512-R6YZnIdN9P9gTauVkZfVmob0/i6/yaAQxnwfMgRLCaFD0TFQ+UQ2pCz40zPAUp3BcNPwMD168GVxmheBb8cGag==}
+  '@storybook/theming@8.3.5':
+    resolution: {integrity: sha512-9HmDDyC691oqfg4RziIM9ElsS2HITaxmH7n/yeUPtuirkPdAQzqOzhvH/Sa0qOhifzs8VjR+Gd/a/ZQ+S38r7w==}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
 
-  '@storybook/vue3-vite@8.3.1':
-    resolution: {integrity: sha512-O/ANX35SmXR/DzolBM/BxMMPYzKXxlc2bkeQP0mqZEKWnqtg7uvUMso1rtZ+J7rL1C4Gjb8QYnTEjH4d9hMETg==}
+  '@storybook/vue3-vite@8.3.5':
+    resolution: {integrity: sha512-y2/fJ8FlhbXZ09nLA/WrYnBFbMyLKlHo+f4fE4Pp/Yk+5OU3z2oCphChc8bwcCseSgbMG1ZY0wwyN3UbH/sRpA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
       vite: ^4.0.0 || ^5.0.0
 
-  '@storybook/vue3@8.3.1':
-    resolution: {integrity: sha512-LpvpK5TSc/C4TixiSLFlleg2YecbEZw4vFhXVeYtoFvGjVjaqFlfSYcti63j6nUzhQUA/18VZIBAcsCGFFMgiQ==}
+  '@storybook/vue3@8.3.5':
+    resolution: {integrity: sha512-qm/c3CFvMlSCy2TCRTT8xEuEgDiSlaQnMq/ywig5xAiExZBdgxMxARRq3FOiXjRJ00F5nEQ5fT9yMftcJhJo6w==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      storybook: ^8.3.1
+      storybook: ^8.3.5
       vue: ^3.0.0
 
   '@supabase/auth-js@2.65.0':
@@ -5168,9 +4722,6 @@ packages:
   '@types/amqplib@0.10.1':
     resolution: {integrity: sha512-j6ANKT79ncUDnAs/+9r9eDujxbeJoTjoVu33gHHcaPfmLQaMhvfbH2GqSe8KUM444epAp1Vl3peVOQfZk3UIqA==}
 
-  '@types/archiver@6.0.2':
-    resolution: {integrity: sha512-KmROQqbQzKGuaAbmK+ZcytkJ51+YqDa7NmbXjmtC5YBLSyQYo21YaUnQ3HbaPFKL1ooo6RQ6OPYPIDyxfpDDXw==}
-
   '@types/argparse@1.0.38':
     resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}
 
@@ -5225,8 +4776,8 @@ packages:
   '@types/convict@6.1.1':
     resolution: {integrity: sha512-R+JLaTvhsD06p4jyjUDtbd5xMtZTRE3c0iI+lrFWZogSVEjgTWPYwvJPVf+t92E+yrlbXa4X4Eg9ro6gPdUt4w==}
 
-  '@types/cookie-parser@1.4.3':
-    resolution: {integrity: sha512-CqSKwFwefj4PzZ5n/iwad/bow2hTCh0FlNAeWLtQM3JA/NX/iYagIpWG2cf1bQKQ2c9gU2log5VUCrn7LDOs0w==}
+  '@types/cookie-parser@1.4.7':
+    resolution: {integrity: sha512-Fvuyi354Z+uayxzIGCwYTayFKocfV7TuDYZClCdIP9ckhvAu/ixDtCB6qx2TT0FKjPLf1f3P/J1rgf6lPs64mw==}
 
   '@types/cookiejar@2.1.5':
     resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
@@ -5243,8 +4794,8 @@ packages:
   '@types/estree@1.0.0':
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
 
-  '@types/estree@1.0.5':
-    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
+  '@types/estree@1.0.6':
+    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
 
   '@types/eventsource@1.1.9':
     resolution: {integrity: sha512-F3K4oyM12o8W9jxuJmW+1sc8kdw0Hj0t+26urwkcolPJTgkfppEfIdftdcXmUU2QPBIwcrYO6diqgIqgCDf1FA==}
@@ -5399,8 +4950,8 @@ packages:
   '@types/mssql@9.1.5':
     resolution: {integrity: sha512-Q9EsgXwuRoX5wvUSu24YfbKMbFChv7pZ/jeCzPkj47ehcuXYsBcfogwrtVFosSjinD4Q/MY2YPGk9Yy1cM2Ywg==}
 
-  '@types/multer@1.4.11':
-    resolution: {integrity: sha512-svK240gr6LVWvv3YGyhLlA+6LRRWA4mnGIU7RcNmgjBYFl6665wcXrRfxGp5tEPVHUNm5FMcmq7too9bxCwX/w==}
+  '@types/multer@1.4.12':
+    resolution: {integrity: sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg==}
 
   '@types/node-fetch@2.6.4':
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
@@ -5447,9 +4998,6 @@ packages:
   '@types/readable-stream@4.0.10':
     resolution: {integrity: sha512-AbUKBjcC8SHmImNi4yK2bbjogQlkFSg7shZCcicxPQapniOlajG8GCc39lvXzCWX4lLRRs7DM3VAeSlqmEVZUA==}
 
-  '@types/readdir-glob@1.1.5':
-    resolution: {integrity: sha512-raiuEPUYqXu+nvtY2Pe8s8FEmZ3x5yAH4VkLdihcPdalvsHltomrRC9BzuStrJ9yk06470hS0Crw0f1pXqD+Hg==}
-
   '@types/replacestream@4.0.1':
     resolution: {integrity: sha512-3ecTmnzB90sgarVpIszCF1cX2cnxwqDovWb31jGrKfxAL0Knui1H7Reaz/zlT9zaE3u0un7L5cNy9fQPy0d2sg==}
 
@@ -5522,9 +5070,6 @@ packages:
   '@types/syslog-client@1.1.2':
     resolution: {integrity: sha512-X8MwGedXYNmYltPDaZQCM9X6cSdfFbJZWhrU81gWKsg+Q6mSgRWs/12Mq9nHaUV4wqMYDNrnytbwbMUiVnWegw==}
 
-  '@types/tar-stream@3.1.3':
-    resolution: {integrity: sha512-Zbnx4wpkWBMBSu5CytMbrT5ZpMiF55qgM+EpHzR4yIDu7mv52cej8hTkOc6K+LzpkOAbxwn/m7j3iO+/l42YkQ==}
-
   '@types/tedious@4.0.9':
     resolution: {integrity: sha512-ipwFvfy9b2m0gjHsIX0D6NAAwGCKokzf5zJqUZHUGt+7uWVlBIy6n2eyMgiKQ8ChLFVxic/zwQUhjLYNzbHDRA==}
 
@@ -5537,15 +5082,15 @@ packages:
   '@types/tough-cookie@4.0.2':
     resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
 
+  '@types/triple-beam@1.3.5':
+    resolution: {integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==}
+
   '@types/tunnel@0.0.3':
     resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==}
 
   '@types/unist@3.0.2':
     resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
 
-  '@types/unzip-stream@0.3.4':
-    resolution: {integrity: sha512-ud0vtsNRF+joUCyvNMyo0j5DKX2Lh/im+xVgRzBEsfHhQYZ+i4fKTveova9XxLzt6Jl6G0e/0mM4aC0gqZYSnA==}
-
   '@types/utf8@3.0.3':
     resolution: {integrity: sha512-+lqLGxWZsEe4Z6OrzBI7Ym4SMUTaMS5yOrHZ0/IL0bpIye1Qbs4PpobJL2mLDbftUXlPFZR7fu6d1yM+bHLX1w==}
 
@@ -5579,8 +5124,8 @@ packages:
   '@types/whatwg-url@11.0.4':
     resolution: {integrity: sha512-lXCmTWSHJvf0TRSO58nm978b8HJ/EdsSsEKLd3ODHFjo+3VGAyyTp4v50nWvwtzBxSMQrVOK7tcuN0zGPLICMw==}
 
-  '@types/ws@8.5.10':
-    resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
+  '@types/ws@8.5.12':
+    resolution: {integrity: sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==}
 
   '@types/ws@8.5.4':
     resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
@@ -5695,11 +5240,11 @@ packages:
       vite: ^5.0.0
       vue: ^3.2.25
 
-  '@vitest/coverage-v8@2.1.1':
-    resolution: {integrity: sha512-md/A7A3c42oTT8JUHSqjP5uKTWJejzUW4jalpvs+rZ27gsURsMU8DEb+8Jf8C6Kj2gwfSHJqobDNBuoqlm0cFw==}
+  '@vitest/coverage-v8@2.1.2':
+    resolution: {integrity: sha512-b7kHrFrs2urS0cOk5N10lttI8UdJ/yP3nB4JYTREvR5o18cR99yPpK4gK8oQgI42BVv0ILWYUSYB7AXkAUDc0g==}
     peerDependencies:
-      '@vitest/browser': 2.1.1
-      vitest: 2.1.1
+      '@vitest/browser': 2.1.2
+      vitest: 2.1.2
     peerDependenciesMeta:
       '@vitest/browser':
         optional: true
@@ -5707,13 +5252,13 @@ packages:
   '@vitest/expect@2.0.5':
     resolution: {integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==}
 
-  '@vitest/expect@2.1.1':
-    resolution: {integrity: sha512-YeueunS0HiHiQxk+KEOnq/QMzlUuOzbU1Go+PgAsHvvv3tUkJPm9xWt+6ITNTlzsMXUjmgm5T+U7KBPK2qQV6w==}
+  '@vitest/expect@2.1.2':
+    resolution: {integrity: sha512-FEgtlN8mIUSEAAnlvn7mP8vzaWhEaAEvhSXCqrsijM7K6QqjB11qoRZYEd4AKSCDz8p0/+yH5LzhZ47qt+EyPg==}
 
-  '@vitest/mocker@2.1.1':
-    resolution: {integrity: sha512-LNN5VwOEdJqCmJ/2XJBywB11DLlkbY0ooDJW3uRX5cZyYCrc4PI/ePX0iQhE3BiEGiQmK4GE7Q/PqCkkaiPnrA==}
+  '@vitest/mocker@2.1.2':
+    resolution: {integrity: sha512-ExElkCGMS13JAJy+812fw1aCv2QO/LBK6CyO4WOPAzLTmve50gydOlWhgdBJPx2ztbADUq3JVI0C5U+bShaeEA==}
     peerDependencies:
-      '@vitest/spy': 2.1.1
+      '@vitest/spy': 2.1.2
       msw: ^2.3.5
       vite: ^5.0.0
     peerDependenciesMeta:
@@ -5725,44 +5270,35 @@ packages:
   '@vitest/pretty-format@2.0.5':
     resolution: {integrity: sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==}
 
-  '@vitest/pretty-format@2.1.1':
-    resolution: {integrity: sha512-SjxPFOtuINDUW8/UkElJYQSFtnWX7tMksSGW0vfjxMneFqxVr8YJ979QpMbDW7g+BIiq88RAGDjf7en6rvLPPQ==}
+  '@vitest/pretty-format@2.1.2':
+    resolution: {integrity: sha512-FIoglbHrSUlOJPDGIrh2bjX1sNars5HbxlcsFKCtKzu4+5lpsRhOCVcuzp0fEhAGHkPZRIXVNzPcpSlkoZ3LuA==}
 
-  '@vitest/runner@2.1.1':
-    resolution: {integrity: sha512-uTPuY6PWOYitIkLPidaY5L3t0JJITdGTSwBtwMjKzo5O6RCOEncz9PUN+0pDidX8kTHYjO0EwUIvhlGpnGpxmA==}
+  '@vitest/runner@2.1.2':
+    resolution: {integrity: sha512-UCsPtvluHO3u7jdoONGjOSil+uON5SSvU9buQh3lP7GgUXHp78guN1wRmZDX4wGK6J10f9NUtP6pO+SFquoMlw==}
 
-  '@vitest/snapshot@2.1.1':
-    resolution: {integrity: sha512-BnSku1WFy7r4mm96ha2FzN99AZJgpZOWrAhtQfoxjUU5YMRpq1zmHRq7a5K9/NjqonebO7iVDla+VvZS8BOWMw==}
+  '@vitest/snapshot@2.1.2':
+    resolution: {integrity: sha512-xtAeNsZ++aRIYIUsek7VHzry/9AcxeULlegBvsdLncLmNCR6tR8SRjn8BbDP4naxtccvzTqZ+L1ltZlRCfBZFA==}
 
   '@vitest/spy@2.0.5':
     resolution: {integrity: sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==}
 
-  '@vitest/spy@2.1.1':
-    resolution: {integrity: sha512-ZM39BnZ9t/xZ/nF4UwRH5il0Sw93QnZXd9NAZGRpIgj0yvVwPpLd702s/Cx955rGaMlyBQkZJ2Ir7qyY48VZ+g==}
+  '@vitest/spy@2.1.2':
+    resolution: {integrity: sha512-GSUi5zoy+abNRJwmFhBDC0yRuVUn8WMlQscvnbbXdKLXX9dE59YbfwXxuJ/mth6eeqIzofU8BB5XDo/Ns/qK2A==}
 
   '@vitest/utils@2.0.5':
     resolution: {integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==}
 
-  '@vitest/utils@2.1.1':
-    resolution: {integrity: sha512-Y6Q9TsI+qJ2CC0ZKj6VBb+T8UPz593N113nnUykqwANqhgf3QkZeHFlusgKLTqrnVHbj/XDKZcDHol+dxVT+rQ==}
+  '@vitest/utils@2.1.2':
+    resolution: {integrity: sha512-zMO2KdYy6mx56btx9JvAqAZ6EyS3g49krMPPrgOp1yxGZiA93HumGk+bZ5jIZtOg5/VBYl5eBmGRQHqq4FG6uQ==}
 
-  '@volar/language-core@1.11.1':
-    resolution: {integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==}
+  '@volar/language-core@2.4.6':
+    resolution: {integrity: sha512-FxUfxaB8sCqvY46YjyAAV6c3mMIq/NWQMVvJ+uS4yxr1KzOvyg61gAuOnNvgCvO4TZ7HcLExBEsWcDu4+K4E8A==}
 
-  '@volar/language-core@2.2.5':
-    resolution: {integrity: sha512-2htyAuxRrAgETmFeUhT4XLELk3LiEcqoW/B8YUXMF6BrGWLMwIR09MFaZYvrA2UhbdAeSyeQ726HaWSWkexUcQ==}
+  '@volar/source-map@2.4.6':
+    resolution: {integrity: sha512-Nsh7UW2ruK+uURIPzjJgF0YRGP5CX9nQHypA2OMqdM2FKy7rh+uv3XgPnWPw30JADbKvZ5HuBzG4gSbVDYVtiw==}
 
-  '@volar/source-map@1.11.1':
-    resolution: {integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==}
-
-  '@volar/source-map@2.2.5':
-    resolution: {integrity: sha512-wrOEIiZNf4E+PWB0AxyM4tfhkfldPsb3bxg8N6FHrxJH2ohar7aGu48e98bp3pR9HUA7P/pR9VrLmkTrgCCnWQ==}
-
-  '@volar/typescript@1.11.1':
-    resolution: {integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==}
-
-  '@volar/typescript@2.2.5':
-    resolution: {integrity: sha512-eSV/n75+ppfEVugMC/salZsI44nXDPAyL6+iTYCNLtiLHGJsnMv9GwiDMujrvAUj/aLQyqRJgYtXRoxop2clCw==}
+  '@volar/typescript@2.4.6':
+    resolution: {integrity: sha512-NMIrA7y5OOqddL9VtngPWYmdQU03htNKFtAYidbYfWA0TOhyGVd9tfcP4TsLWQ+RBWDZCbBqsr8xzU0ZOxYTCQ==}
 
   '@vue-flow/background@1.3.0':
     resolution: {integrity: sha512-fu/8s9wzSOQIitnSTI10XT3bzTtagh4h8EF2SWwtlDklOZjAaKy75lqv4htHa3wigy/r4LGCOGwLw3Pk88/AxA==}
@@ -5770,19 +5306,19 @@ packages:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
 
-  '@vue-flow/controls@1.1.1':
-    resolution: {integrity: sha512-TCoRD5aYZQsM/N7QlPJcIILg1Gxm0O/zoUikxaeadcom1OlKFHutY72agsySJEWM6fTlyb7w8DYCbB4T8YbFoQ==}
+  '@vue-flow/controls@1.1.2':
+    resolution: {integrity: sha512-6dtl/JnwDBNau5h3pDBdOCK6tdxiVAOL3cyruRL61gItwq5E97Hmjmj2BIIqX2p7gU1ENg3z80Z4zlu58fGlsg==}
     peerDependencies:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
 
-  '@vue-flow/core@1.33.5':
-    resolution: {integrity: sha512-Obo+KHmcww/NYGARMqVH1dhd42QeFzV+TNwytrjVgYCoMVCNjs/blCh437TYTsNy4vgX1NKpNwTbQrS+keurgA==}
+  '@vue-flow/core@1.41.2':
+    resolution: {integrity: sha512-nRGMXPH4oOyC5I1W8HLqGarBFYZZMNhuHlLaai7+LkDmzvGark+c/ucnJfwYaI2ho/CzQQ8q1J3jMcr+Np2kFA==}
     peerDependencies:
       vue: ^3.3.0
 
-  '@vue-flow/minimap@1.4.0':
-    resolution: {integrity: sha512-GetmN8uOQxIx4ja85VDnIwpZO5SnGIOfYSqUw8MRMbc8CdACun2M2e3FRaMZRaWapclU2ssXms4xHMWrA3YWpw==}
+  '@vue-flow/minimap@1.5.0':
+    resolution: {integrity: sha512-JhxXDF+8uTc7sgkZHDIvFpHqSl4wsK9xp8Kz5OHwNcXlgGcwqj4yad6jcc1B6bGxm+huESpNmoPotQbpMn6rVw==}
     peerDependencies:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
@@ -5793,24 +5329,24 @@ packages:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
 
-  '@vue/compiler-core@3.4.21':
-    resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==}
+  '@vue/compiler-core@3.5.11':
+    resolution: {integrity: sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==}
 
-  '@vue/compiler-dom@3.4.21':
-    resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
+  '@vue/compiler-dom@3.5.11':
+    resolution: {integrity: sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==}
 
-  '@vue/compiler-sfc@3.4.21':
-    resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==}
+  '@vue/compiler-sfc@3.5.11':
+    resolution: {integrity: sha512-gsbBtT4N9ANXXepprle+X9YLg2htQk1sqH/qGJ/EApl+dgpUBdTv3yP7YlR535uHZY3n6XaR0/bKo0BgwwDniw==}
 
-  '@vue/compiler-ssr@3.4.21':
-    resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==}
+  '@vue/compiler-ssr@3.5.11':
+    resolution: {integrity: sha512-P4+GPjOuC2aFTk1Z4WANvEhyOykcvEd5bIj2KVNGKGfM745LaXGr++5njpdBTzVz5pZifdlR1kpYSJJpIlSePA==}
+
+  '@vue/compiler-vue2@2.7.16':
+    resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
 
   '@vue/devtools-api@6.4.5':
     resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
 
-  '@vue/devtools-api@6.5.0':
-    resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==}
-
   '@vue/devtools-api@6.6.4':
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
@@ -5825,47 +5361,33 @@ packages:
       typescript:
         optional: true
 
-  '@vue/language-core@1.8.27':
-    resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
+  '@vue/language-core@2.1.6':
+    resolution: {integrity: sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==}
     peerDependencies:
       typescript: ^5.6.2
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  '@vue/language-core@2.0.19':
-    resolution: {integrity: sha512-A9EGOnvb51jOvnCYoRLnMP+CcoPlbZVxI9gZXE/y2GksRWM6j/PrLEIC++pnosWTN08tFpJgxhSS//E9v/Sg+Q==}
+  '@vue/reactivity@3.5.11':
+    resolution: {integrity: sha512-Nqo5VZEn8MJWlCce8XoyVqHZbd5P2NH+yuAaFzuNSR96I+y1cnuUiq7xfSG+kyvLSiWmaHTKP1r3OZY4mMD50w==}
+
+  '@vue/runtime-core@3.5.11':
+    resolution: {integrity: sha512-7PsxFGqwfDhfhh0OcDWBG1DaIQIVOLgkwA5q6MtkPiDFjp5gohVnJEahSktwSFLq7R5PtxDKy6WKURVN1UDbzA==}
+
+  '@vue/runtime-dom@3.5.11':
+    resolution: {integrity: sha512-GNghjecT6IrGf0UhuYmpgaOlN7kxzQBhxWEn08c/SQDxv1yy4IXI1bn81JgEpQ4IXjRxWtPyI8x0/7TF5rPfYQ==}
+
+  '@vue/server-renderer@3.5.11':
+    resolution: {integrity: sha512-cVOwYBxR7Wb1B1FoxYvtjJD8X/9E5nlH4VSkJy2uMA1MzYNdzAAB//l8nrmN9py/4aP+3NjWukf9PZ3TeWULaA==}
     peerDependencies:
-      typescript: ^5.6.2
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+      vue: 3.5.11
 
-  '@vue/reactivity@3.4.21':
-    resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==}
+  '@vue/shared@3.5.11':
+    resolution: {integrity: sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==}
 
-  '@vue/runtime-core@3.4.21':
-    resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==}
-
-  '@vue/runtime-dom@3.4.21':
-    resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==}
-
-  '@vue/server-renderer@3.4.21':
-    resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==}
-    peerDependencies:
-      vue: 3.4.21
-
-  '@vue/shared@3.4.21':
-    resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}
-
-  '@vue/test-utils@2.4.3':
-    resolution: {integrity: sha512-F4K7mF+ad++VlTrxMJVRnenKSJmO6fkQt2wpRDiKDesQMkfpniGWsqEi/JevxGBo2qEkwwjvTUAoiGJLNx++CA==}
-    peerDependencies:
-      '@vue/server-renderer': ^3.0.1
-      vue: ^3.0.1
-    peerDependenciesMeta:
-      '@vue/server-renderer':
-        optional: true
+  '@vue/test-utils@2.4.6':
+    resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
 
   '@vueuse/components@10.11.0':
     resolution: {integrity: sha512-ZvLZI23d5ZAtva5fGyYh/jQtZO8l+zJ5tAXyYNqHJZkq1o5yWyqZhENvSv5mfDmN5IuAOp4tq02mRmX/ipFGcg==}
@@ -5891,8 +5413,8 @@ packages:
   '@vvo/tzdb@6.141.0':
     resolution: {integrity: sha512-vpuv8Eo75WwW6oHygfSSJ8J2AIADlqoHu9HmKxD8Ey/hmRhxt0+/nEGbzBy/Y/Q1qsdgDj3kP3NRLr2082VzgA==}
 
-  '@xata.io/client@0.30.0':
-    resolution: {integrity: sha512-+mVC4hnYZutcNg+ivBcsJxVXuBrcyidB/ogW6iDAsJtKXpPNbhGNL77v6sGXxzKYxjtDsK/EOntmYjZT3mgo7g==}
+  '@xata.io/client@0.28.4':
+    resolution: {integrity: sha512-B02WHIA/ViHya84XvH6JCo13rd5h4S5vVyY2aYi6fIcjDIbCpsSLJ4oGWpdodovRYeAZy9Go4OhdyZwMIRC4BQ==}
     peerDependencies:
       typescript: ^5.6.2
 
@@ -5930,6 +5452,10 @@ packages:
     resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
     engines: {node: '>=0.4.0'}
 
+  acorn-walk@8.3.4:
+    resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
+    engines: {node: '>=0.4.0'}
+
   acorn@7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
     engines: {node: '>=0.4.0'}
@@ -5976,9 +5502,23 @@ packages:
       ajv:
         optional: true
 
+  ajv-formats@3.0.1:
+    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
+  ajv@8.12.0:
+    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+
+  ajv@8.13.0:
+    resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==}
+
   ajv@8.17.1:
     resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
 
@@ -6047,14 +5587,6 @@ packages:
   arch@2.2.0:
     resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
 
-  archiver-utils@5.0.2:
-    resolution: {integrity: sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==}
-    engines: {node: '>= 14'}
-
-  archiver@7.0.1:
-    resolution: {integrity: sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==}
-    engines: {node: '>= 14'}
-
   are-we-there-yet@3.0.1:
     resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -6105,6 +5637,10 @@ packages:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
 
+  array.prototype.filter@1.0.4:
+    resolution: {integrity: sha512-r+mCJ7zXgXElgR4IRC+fkvNCeoaavWBs6EdCso5Tbcf+iEMKzBU/His60lt34WEZ9vlb8wDkZvQGcVI5GwkfoQ==}
+    engines: {node: '>= 0.4'}
+
   array.prototype.findlastindex@1.2.3:
     resolution: {integrity: sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==}
     engines: {node: '>= 0.4'}
@@ -6227,18 +5763,12 @@ packages:
   axios-retry@3.7.0:
     resolution: {integrity: sha512-ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ==}
 
-  axios@1.7.3:
-    resolution: {integrity: sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==}
-
   axios@1.7.4:
     resolution: {integrity: sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==}
 
   axios@1.7.7:
     resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
 
-  b4a@1.6.7:
-    resolution: {integrity: sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==}
-
   babel-jest@29.6.2:
     resolution: {integrity: sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -6271,9 +5801,6 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  bare-events@2.5.0:
-    resolution: {integrity: sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==}
-
   base-64@1.0.0:
     resolution: {integrity: sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==}
 
@@ -6305,9 +5832,6 @@ packages:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
 
-  binary@0.3.0:
-    resolution: {integrity: sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==}
-
   binascii@0.0.2:
     resolution: {integrity: sha512-rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==}
 
@@ -6357,8 +5881,8 @@ packages:
   brace-expansion@2.0.1:
     resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
 
-  braces@3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
   browser-assert@1.2.1:
@@ -6380,17 +5904,13 @@ packages:
   bser@2.1.1:
     resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
 
-  bson@6.3.0:
-    resolution: {integrity: sha512-balJfqwwTBddxfnidJZagCBPP/f48zj9Sdp3OJswREOgsJzHiQSaOIAtApSgDQFYgHqAvFkp53AFSqjMDZoTFw==}
+  bson@6.8.0:
+    resolution: {integrity: sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==}
     engines: {node: '>=16.20.1'}
 
   buffer-crc32@0.2.13:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
 
-  buffer-crc32@1.0.0:
-    resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==}
-    engines: {node: '>=8.0.0'}
-
   buffer-equal-constant-time@1.0.1:
     resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
 
@@ -6406,10 +5926,6 @@ packages:
   buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
 
-  buffers@0.1.1:
-    resolution: {integrity: sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==}
-    engines: {node: '>=0.2.0'}
-
   buildcheck@0.0.6:
     resolution: {integrity: sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==}
     engines: {node: '>=10.0.0'}
@@ -6485,11 +6001,8 @@ packages:
   camelize@1.0.1:
     resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
 
-  caniuse-lite@1.0.30001597:
-    resolution: {integrity: sha512-7LjJvmQU6Sj7bL0j5b5WY/3n7utXUJvAe1lxhsHDbLmwX9mdL86Yjtr+5SRCyf8qME4M7pU2hswj0FpyBVCv9w==}
-
-  caniuse-lite@1.0.30001617:
-    resolution: {integrity: sha512-mLyjzNI9I+Pix8zwcrpxEbGlfqOkF9kM3ptzmKNw5tizSyYwMe+nGLTqMK9cO+0E+Bh6TsBxNAaHWEM8xwSsmA==}
+  caniuse-lite@1.0.30001667:
+    resolution: {integrity: sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==}
 
   capital-case@1.0.4:
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
@@ -6501,9 +6014,6 @@ packages:
     resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==}
     engines: {node: '>=12'}
 
-  chainsaw@0.1.0:
-    resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==}
-
   chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
@@ -6519,6 +6029,9 @@ packages:
   change-case@4.1.2:
     resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
 
+  change-case@5.4.4:
+    resolution: {integrity: sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==}
+
   char-regex@1.0.2:
     resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
     engines: {node: '>=10'}
@@ -6550,6 +6063,10 @@ packages:
   cheerio-select@2.1.0:
     resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
 
+  cheerio@1.0.0:
+    resolution: {integrity: sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==}
+    engines: {node: '>=18.17'}
+
   cheerio@1.0.0-rc.12:
     resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==}
     engines: {node: '>= 6'}
@@ -6558,9 +6075,9 @@ packages:
     resolution: {integrity: sha512-hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw==}
     engines: {node: '>= 0.12'}
 
-  chokidar@3.5.2:
-    resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==}
-    engines: {node: '>= 8.10.0'}
+  chokidar@4.0.1:
+    resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==}
+    engines: {node: '>= 14.16.0'}
 
   chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
@@ -6644,8 +6161,8 @@ packages:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
 
-  clsx@1.2.1:
-    resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
+  clsx@2.1.1:
+    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
 
   cluster-key-slot@1.1.2:
@@ -6742,16 +6259,15 @@ packages:
   commondir@1.0.1:
     resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
 
+  compare-versions@6.1.1:
+    resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
+
   component-emitter@1.3.0:
     resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
 
   component-type@1.2.1:
     resolution: {integrity: sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==}
 
-  compress-commons@6.0.2:
-    resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==}
-    engines: {node: '>= 14'}
-
   compressible@2.0.18:
     resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}
     engines: {node: '>= 0.6'}
@@ -6815,23 +6331,23 @@ packages:
     resolution: {integrity: sha512-qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ==}
     engines: {node: '>=6'}
 
-  cookie-parser@1.4.6:
-    resolution: {integrity: sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==}
+  cookie-parser@1.4.7:
+    resolution: {integrity: sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==}
     engines: {node: '>= 0.8.0'}
 
   cookie-signature@1.0.6:
     resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
 
-  cookie@0.4.1:
-    resolution: {integrity: sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==}
-    engines: {node: '>= 0.6'}
-
   cookie@0.4.2:
     resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
     engines: {node: '>= 0.6'}
 
-  cookie@0.6.0:
-    resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
+  cookie@0.7.1:
+    resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==}
+    engines: {node: '>= 0.6'}
+
+  cookie@0.7.2:
+    resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
     engines: {node: '>= 0.6'}
 
   cookiejar@2.1.4:
@@ -6853,15 +6369,6 @@ packages:
     resolution: {integrity: sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==}
     engines: {node: '>=10.0.0'}
 
-  crc-32@1.2.2:
-    resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
-    engines: {node: '>=0.8'}
-    hasBin: true
-
-  crc32-stream@6.0.0:
-    resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==}
-    engines: {node: '>= 14'}
-
   create-require@1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
 
@@ -7028,6 +6535,18 @@ packages:
     resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
     engines: {node: '>=18'}
 
+  data-view-buffer@1.0.1:
+    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.1:
+    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.0:
+    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+    engines: {node: '>= 0.4'}
+
   date-fns-tz@2.0.0:
     resolution: {integrity: sha512-OAtcLdB9vxSXTWHdT8b398ARImVwQMyjfYGkKD2zaGpHseG2UPHbHjXELReErZFxWdSLph3c2zOaaTyHfOhERQ==}
     peerDependencies:
@@ -7221,6 +6740,9 @@ packages:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
 
+  discontinuous-range@1.0.0:
+    resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==}
+
   dlv@1.1.3:
     resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
 
@@ -7271,8 +6793,8 @@ packages:
     resolution: {integrity: sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww==}
     deprecated: dommatrix is no longer maintained. Please use @thednp/dommatrix.
 
-  dompurify@2.4.7:
-    resolution: {integrity: sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==}
+  dompurify@3.1.7:
+    resolution: {integrity: sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==}
 
   domutils@2.8.0:
     resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
@@ -7369,6 +6891,9 @@ packages:
     resolution: {integrity: sha512-++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ==}
     engines: {node: '>=8.10.0'}
 
+  encoding-sniffer@0.2.0:
+    resolution: {integrity: sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==}
+
   encoding@0.1.13:
     resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
 
@@ -7402,6 +6927,12 @@ packages:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
 
+  enzyme-shallow-equal@1.0.7:
+    resolution: {integrity: sha512-/um0GFqUXnpM9SvKtje+9Tjoz3f1fpBC3eXRFrNs8kpYn69JljciYP7KZTqM/YQbUY9KUjvKB4jo/q+L6WGGvg==}
+
+  enzyme@3.11.0:
+    resolution: {integrity: sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==}
+
   epub2@3.0.2:
     resolution: {integrity: sha512-rhvpt27CV5MZfRetfNtdNwi3XcNg1Am0TwfveJkK8YWeHItHepQ8Js9J06v8XRIjuTrCW/NSGYMTy55Of7BfNQ==}
 
@@ -7419,10 +6950,17 @@ packages:
     resolution: {integrity: sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==}
     engines: {node: '>= 0.4'}
 
+  es-abstract@1.23.3:
+    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
+    engines: {node: '>= 0.4'}
+
   es-aggregate-error@1.0.12:
     resolution: {integrity: sha512-j0PupcmELoVbYS2NNrsn5zcLLEsryQwP02x8fRawh7c2eEaPHwJFAxltZsqV7HJjsF57+SMpYyVRWgbVLfOagg==}
     engines: {node: '>= 0.4'}
 
+  es-array-method-boxes-properly@1.0.0:
+    resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==}
+
   es-define-property@1.0.0:
     resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
     engines: {node: '>= 0.4'}
@@ -7437,6 +6975,10 @@ packages:
   es-module-lexer@1.5.3:
     resolution: {integrity: sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==}
 
+  es-object-atoms@1.0.0:
+    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+    engines: {node: '>= 0.4'}
+
   es-set-tostringtag@2.0.1:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
     engines: {node: '>= 0.4'}
@@ -7458,11 +7000,11 @@ packages:
   esbuild-register@3.5.0:
     resolution: {integrity: sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==}
     peerDependencies:
-      esbuild: ^0.20.2
+      esbuild: ^0.24.0
 
-  esbuild@0.20.2:
-    resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
-    engines: {node: '>=12'}
+  esbuild@0.24.0:
+    resolution: {integrity: sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==}
+    engines: {node: '>=18'}
     hasBin: true
 
   escalade@3.1.1:
@@ -7620,6 +7162,7 @@ packages:
   eslint@8.57.0:
     resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
 
   esm-resolve@1.0.8:
@@ -7687,6 +7230,9 @@ packages:
   eventemitter3@4.0.7:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
 
+  eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+
   events@3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
@@ -7739,8 +7285,8 @@ packages:
     resolution: {integrity: sha512-ss9d3mBChOLTEtyfzXCsxlItUxpgS3i4cb/F70G6Q5ohQzmD12XB4x/Y9U6YboeeYBJZt7WQ5yUNu7ZSQ/EGyQ==}
     engines: {node: '>=v16'}
 
-  express-openapi-validator@5.3.3:
-    resolution: {integrity: sha512-WolpeQTubIlPOjKZiMmFL+pvztAq4bpL/ylvKjs2v7JN/8qC2J2k21MuYcz0o5vQBt4cdIg2cZ2I1Ik2R3FG6w==}
+  express-openapi-validator@5.3.7:
+    resolution: {integrity: sha512-AFlIXvICrPWJvWtrsfpL212kyvmyzThcZ1ASnnsRqmzxSo/3SV+J7M1oEsFYbqo7AYQPGtSBKy7eheGM6wPwag==}
     peerDependencies:
       express: '*'
 
@@ -7756,8 +7302,8 @@ packages:
     peerDependencies:
       express: 4 || 5 || ^5.0.0-beta.1
 
-  express@4.21.0:
-    resolution: {integrity: sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==}
+  express@4.21.1:
+    resolution: {integrity: sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==}
     engines: {node: '>= 0.10.0'}
 
   extend@3.0.2:
@@ -7782,9 +7328,6 @@ packages:
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  fast-fifo@1.3.2:
-    resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}
-
   fast-glob@3.2.12:
     resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
     engines: {node: '>=8.6.0'}
@@ -7812,14 +7355,6 @@ packages:
   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
-
-  fast-xml-parser@4.3.5:
-    resolution: {integrity: sha512-sWvP1Pl8H03B8oFJpFR3HE31HUfwtX7Rlf9BNsvdpujD4n7WMhfmu8h9wOV2u+c1k0ZilTADhPqypzx2J690ZQ==}
-    hasBin: true
-
   fast-xml-parser@4.4.1:
     resolution: {integrity: sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==}
     hasBin: true
@@ -7876,8 +7411,8 @@ packages:
     resolution: {integrity: sha512-GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ==}
     engines: {node: '>= 10.4.0'}
 
-  fill-range@7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
 
   filter-obj@1.1.0:
@@ -8132,11 +7667,6 @@ packages:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
 
-  glob@10.3.10:
-    resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    hasBin: true
-
   glob@10.3.3:
     resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -8175,6 +7705,10 @@ packages:
     resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
     engines: {node: '>= 0.4'}
 
+  globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+
   globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
@@ -8262,6 +7796,10 @@ packages:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
 
+  has@1.0.4:
+    resolution: {integrity: sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==}
+    engines: {node: '>= 0.4.0'}
+
   hash-sum@2.0.0:
     resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==}
 
@@ -8314,6 +7852,9 @@ packages:
   hosted-git-info@2.8.9:
     resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
 
+  html-element-map@1.3.1:
+    resolution: {integrity: sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==}
+
   html-encoding-sniffer@3.0.0:
     resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
     engines: {node: '>=12'}
@@ -8383,6 +7924,10 @@ packages:
     resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
     engines: {node: '>= 14'}
 
+  https-proxy-agent@7.0.5:
+    resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
+    engines: {node: '>= 14'}
+
   human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
     engines: {node: '>=8.12.0'}
@@ -8539,10 +8084,6 @@ packages:
   is-bigint@1.0.4:
     resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
 
-  is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: '>=8'}
-
   is-boolean-object@1.1.2:
     resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
     engines: {node: '>= 0.4'}
@@ -8565,6 +8106,10 @@ packages:
   is-core-module@2.13.1:
     resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
 
+  is-data-view@1.0.1:
+    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+    engines: {node: '>= 0.4'}
+
   is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
     engines: {node: '>= 0.4'}
@@ -8670,6 +8215,9 @@ packages:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
 
+  is-subset@0.1.1:
+    resolution: {integrity: sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==}
+
   is-symbol@1.0.4:
     resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
     engines: {node: '>= 0.4'}
@@ -8741,10 +8289,6 @@ packages:
     resolution: {integrity: sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==}
     engines: {node: '>=10'}
 
-  istanbul-reports@3.1.6:
-    resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
-    engines: {node: '>=8'}
-
   istanbul-reports@3.1.7:
     resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}
     engines: {node: '>=8'}
@@ -9186,10 +8730,6 @@ packages:
     resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
     engines: {node: '> 0.8'}
 
-  lazystream@1.0.1:
-    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
-    engines: {node: '>= 0.6.3'}
-
   ldapts@4.2.6:
     resolution: {integrity: sha512-r1eOj2PtTJi+9aZxLirktoHntuYXlbQD9ZXCjiZmJx0VBQtBcWc+rueqABuh/AxMcFHNPDSJLJAXxoj5VevTwQ==}
     engines: {node: '>=14'}
@@ -9344,6 +8884,12 @@ packages:
   lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
+  lodash.escape@4.0.1:
+    resolution: {integrity: sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==}
+
+  lodash.flattendeep@4.4.0:
+    resolution: {integrity: sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==}
+
   lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
 
@@ -9397,8 +8943,9 @@ packages:
     resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
     engines: {node: '>=10'}
 
-  logform@2.4.2:
-    resolution: {integrity: sha512-W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw==}
+  logform@2.6.1:
+    resolution: {integrity: sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==}
+    engines: {node: '>= 12.0.0'}
 
   long@4.0.0:
     resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
@@ -9458,6 +9005,10 @@ packages:
     resolution: {integrity: sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==}
     engines: {node: '>=12'}
 
+  luxon@3.5.0:
+    resolution: {integrity: sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==}
+    engines: {node: '>=12'}
+
   lz-string@1.5.0:
     resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
     hasBin: true
@@ -9580,8 +9131,8 @@ packages:
     resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
     engines: {node: '>= 0.6'}
 
-  micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
 
   mime-db@1.52.0:
@@ -9686,10 +9237,6 @@ packages:
     resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
     engines: {node: '>=8'}
 
-  minipass@7.0.2:
-    resolution: {integrity: sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
   minipass@7.1.2:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -9824,10 +9371,10 @@ packages:
   mlly@1.7.1:
     resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==}
 
-  mobx-react-lite@3.4.3:
-    resolution: {integrity: sha512-NkJREyFTSUXR772Qaai51BnE1voWx56LOL80xG7qkZr6vo8vEaLF3sz1JNUVh+rxmUzxYaqOhfuxTfqUh0FXUg==}
+  mobx-react-lite@4.0.7:
+    resolution: {integrity: sha512-RjwdseshK9Mg8On5tyJZHtGD+J78ZnCnRaxeQDSiciKVQDUbfZcXhmld0VMxAwvcTnPEHZySGGewm467Fcpreg==}
     peerDependencies:
-      mobx: ^6.1.0
+      mobx: ^6.9.0
       react: ^16.8.0 || ^17 || ^18
       react-dom: '*'
       react-native: '*'
@@ -9837,10 +9384,10 @@ packages:
       react-native:
         optional: true
 
-  mobx-react@7.6.0:
-    resolution: {integrity: sha512-+HQUNuh7AoQ9ZnU6c4rvbiVVl+wEkb9WqYsVDzGLng+Dqj1XntHu79PvEWKtSMoMj67vFp/ZPXcElosuJO8ckA==}
+  mobx-react@9.1.1:
+    resolution: {integrity: sha512-gVV7AdSrAAxqXOJ2bAbGa5TkPqvITSzaPiiEkzpW4rRsMhSec7C2NBCJYILADHKp2tzOAIETGRsIY0UaCV5aEw==}
     peerDependencies:
-      mobx: ^6.1.0
+      mobx: ^6.9.0
       react: ^16.8.0 || ^17 || ^18
       react-dom: '*'
       react-native: '*'
@@ -9889,6 +9436,9 @@ packages:
       socks:
         optional: true
 
+  moo@0.5.2:
+    resolution: {integrity: sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==}
+
   mqtt-packet@9.0.0:
     resolution: {integrity: sha512-8v+HkX+fwbodsWAZIZTI074XIoxVBOmPeggQuDFCGg1SqNcC+uoRMWu7J6QlJPqIUIJXmjNYYHxBBLr1Y/Df4w==}
 
@@ -9918,9 +9468,6 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
-  muggle-string@0.3.1:
-    resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
-
   muggle-string@0.4.1:
     resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==}
 
@@ -9975,6 +9522,10 @@ packages:
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
+  nearley@2.20.1:
+    resolution: {integrity: sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==}
+    hasBin: true
+
   negotiator@0.6.3:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
     engines: {node: '>= 0.6'}
@@ -10134,14 +9685,11 @@ packages:
     engines: {node: '>= 6.9.0'}
     hasBin: true
     peerDependencies:
-      chokidar: 3.5.2
+      chokidar: ^4.0.1
     peerDependenciesMeta:
       chokidar:
         optional: true
 
-  nwsapi@2.2.2:
-    resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==}
-
   nwsapi@2.2.7:
     resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
 
@@ -10175,10 +9723,18 @@ packages:
   object-inspect@1.13.1:
     resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
 
+  object-inspect@1.13.2:
+    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+    engines: {node: '>= 0.4'}
+
   object-is@1.1.5:
     resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
     engines: {node: '>= 0.4'}
 
+  object-is@1.1.6:
+    resolution: {integrity: sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==}
+    engines: {node: '>= 0.4'}
+
   object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
@@ -10191,6 +9747,10 @@ packages:
     resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
     engines: {node: '>= 0.4'}
 
+  object.entries@1.1.8:
+    resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==}
+    engines: {node: '>= 0.4'}
+
   object.fromentries@2.0.7:
     resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
     engines: {node: '>= 0.4'}
@@ -10202,6 +9762,10 @@ packages:
     resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
     engines: {node: '>= 0.4'}
 
+  object.values@1.2.0:
+    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
+    engines: {node: '>= 0.4'}
+
   obuf@1.1.2:
     resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
 
@@ -10246,11 +9810,8 @@ packages:
       zod:
         optional: true
 
-  openapi-sampler@1.4.0:
-    resolution: {integrity: sha512-3FKJQCHAMG9T7RsRy9u5Ft4ERPq1QQmn77C8T3OSofYL9uur59AqychvQ0YQKijrqRwIkAbzkh+nQnAE3gjMVA==}
-
-  openapi-types@10.0.0:
-    resolution: {integrity: sha512-Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ==}
+  openapi-sampler@1.5.1:
+    resolution: {integrity: sha512-tIWIrZUKNAsbqf3bd9U1oH6JEXo8LNYuDlXw26By67EygpjT+ArFnsxxyTMjFWRfbqo5ozkvgSQDK69Gd8CddA==}
 
   openapi-types@12.1.3:
     resolution: {integrity: sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==}
@@ -10363,6 +9924,9 @@ packages:
   parse5-htmlparser2-tree-adapter@7.0.0:
     resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
 
+  parse5-parser-stream@7.1.2:
+    resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==}
+
   parse5@6.0.1:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
 
@@ -10400,10 +9964,6 @@ packages:
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  path-scurry@1.10.1:
-    resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
   path-scurry@1.11.1:
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
@@ -10411,8 +9971,9 @@ packages:
   path-to-regexp@0.1.10:
     resolution: {integrity: sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==}
 
-  path-to-regexp@6.2.2:
-    resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==}
+  path-to-regexp@8.2.0:
+    resolution: {integrity: sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==}
+    engines: {node: '>=16'}
 
   path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
@@ -10520,8 +10081,8 @@ packages:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
 
-  pinia@2.1.6:
-    resolution: {integrity: sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==}
+  pinia@2.2.4:
+    resolution: {integrity: sha512-K7ZhpMY9iJ9ShTC0cR2+PnxdQRuwVIsXDO/WIEV/RnMC/vmSoKDTKW/exNQYPI+4ij10UjXqdNiEHwn47McANQ==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
       typescript: ^5.6.2
@@ -10867,13 +10428,20 @@ packages:
   queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
-  queue-tick@1.0.1:
-    resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==}
-
   quoted-printable@1.0.1:
     resolution: {integrity: sha512-cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g==}
     hasBin: true
 
+  raf@3.4.1:
+    resolution: {integrity: sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==}
+
+  railroad-diagrams@1.0.0:
+    resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==}
+
+  randexp@0.4.6:
+    resolution: {integrity: sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==}
+    engines: {node: '>=0.12'}
+
   random-bytes@1.0.0:
     resolution: {integrity: sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==}
     engines: {node: '>= 0.8'}
@@ -10923,10 +10491,15 @@ packages:
   react-is@18.2.0:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
 
-  react-tabs@4.3.0:
-    resolution: {integrity: sha512-2GfoG+f41kiBIIyd3gF+/GRCCYtamC8/2zlAcD8cqQmqI9Q+YVz7fJLHMmU9pXDVYYHpJeCgUSBJju85vu5q8Q==}
+  react-shallow-renderer@16.15.0:
+    resolution: {integrity: sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0-0 || ^18.0.0
+      react: ^16.0.0 || ^17.0.0 || ^18.0.0
+
+  react-tabs@6.0.2:
+    resolution: {integrity: sha512-aQXTKolnM28k3KguGDBSAbJvcowOQr23A+CUJdzJtOSDOtTwzEaJA+1U4KwhNL9+Obe+jFS7geuvA7ICQPXOnQ==}
+    peerDependencies:
+      react: ^18.0.0
 
   react@18.2.0:
     resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
@@ -10965,12 +10538,9 @@ packages:
     resolution: {integrity: sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==}
     engines: {node: '>=8'}
 
-  readdir-glob@1.1.3:
-    resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==}
-
-  readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
+  readdirp@4.0.2:
+    resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==}
+    engines: {node: '>= 14.16.0'}
 
   readline-sync@1.4.10:
     resolution: {integrity: sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==}
@@ -11010,8 +10580,8 @@ packages:
   redis@4.6.14:
     resolution: {integrity: sha512-GrNg/e33HtsQwNXL7kJT+iNFPSwE1IPmd7wzV3j4f2z0EYxZfZE7FVTmUysgAtqQQtg5NXF5SNLR9OdO/UHOfw==}
 
-  redoc@2.1.3:
-    resolution: {integrity: sha512-d7F9qLLxaiFW4GC03VkwlX9wuRIpx9aiIIf3o6mzMnqPfhxrn2IRKGndrkJeVdItgCfmg9jXZiFEowm60f1meQ==}
+  redoc@2.1.5:
+    resolution: {integrity: sha512-POSbVg+7WLf+/5/c6GWLxL7+9t2D+1WlZdLN0a6qaCQc+ih3XYzteRBkXEN5kjrYrRNjdspfxTZkDLN5WV3Tzg==}
     engines: {node: '>=6.9', npm: '>=3.0.0'}
     peerDependencies:
       core-js: ^3.1.4
@@ -11041,6 +10611,10 @@ packages:
     resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
     engines: {node: '>= 0.4'}
 
+  regexp.prototype.flags@1.5.3:
+    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
+    engines: {node: '>= 0.4'}
+
   regjsparser@0.10.0:
     resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
     hasBin: true
@@ -11099,9 +10673,6 @@ packages:
     resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
     engines: {node: '>=10'}
 
-  resolve@1.19.0:
-    resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==}
-
   resolve@1.22.3:
     resolution: {integrity: sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==}
     hasBin: true
@@ -11114,6 +10685,10 @@ packages:
     resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
     engines: {node: '>=8'}
 
+  ret@0.1.15:
+    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
+    engines: {node: '>=0.12'}
+
   retry-request@7.0.2:
     resolution: {integrity: sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==}
     engines: {node: '>=14'}
@@ -11157,8 +10732,8 @@ packages:
   rndm@1.2.0:
     resolution: {integrity: sha512-fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw==}
 
-  rollup@4.22.2:
-    resolution: {integrity: sha512-JWWpTrZmqQGQWt16xvNn6KVIUz16VtZwl984TKw0dfqqRpFwtLJYYk1/4BTgplndMQKWUk/yB4uOShYmMzA2Vg==}
+  rollup@4.24.0:
+    resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -11174,6 +10749,9 @@ packages:
   rss-parser@3.13.0:
     resolution: {integrity: sha512-7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w==}
 
+  rst-selector-parser@2.2.3:
+    resolution: {integrity: sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==}
+
   run-async@2.4.1:
     resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
     engines: {node: '>=0.12.0'}
@@ -11500,9 +11078,6 @@ packages:
     resolution: {integrity: sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==}
     engines: {node: '>= 0.6'}
 
-  sse-channel@4.0.0:
-    resolution: {integrity: sha512-I539Tc0gyDTQ2QCSg4v78Flxo/UbqR9x7JoyPcqaPtwo+qzeOw/fF+aPSbk0xTvBQAAAZk7Dlkc8K1bum5GUnw==}
-
   ssh2-sftp-client@7.2.3:
     resolution: {integrity: sha512-Bmq4Uewu3e0XOwu5bnPbiS5KRQYv+dff5H6+85V4GZrPrt0Fkt1nUH+uXanyAkoNxUpzjnAPEEoLdOaBO9c3xw==}
     engines: {node: '>=10.24.1'}
@@ -11559,8 +11134,8 @@ packages:
     resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
     engines: {node: '>=4', npm: '>=6'}
 
-  storybook@8.3.1:
-    resolution: {integrity: sha512-CYqt5KOpaTgb8OczNo2+EtMi8YNDPi4vNVebVlLDOroWxyulb8I7MIOH9gALczcIOb+TZUArPztjoa8rkXTaDQ==}
+  storybook@8.3.5:
+    resolution: {integrity: sha512-hYQVtP2l+3kO8oKDn4fjXXQYxgTRsj/LaV6lUMJH0zt+OhVmDXKJLxmdUP4ieTm0T8wEbSYosFavgPcQZlxRfw==}
     hasBin: true
 
   stream-browserify@3.0.0:
@@ -11582,9 +11157,6 @@ packages:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
 
-  streamx@2.20.1:
-    resolution: {integrity: sha512-uTa0mU6WUC65iUvzKH4X9hEdvSW7rbPxPtwfWiLMSj3qTdQbAiUboZTxauKfpFuGIGa1C2BYijZ7wgdUXICJhA==}
-
   strict-event-emitter-types@2.0.0:
     resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
 
@@ -11619,18 +11191,29 @@ packages:
     resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
     engines: {node: '>= 0.4'}
 
+  string.prototype.trim@1.2.9:
+    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
+    engines: {node: '>= 0.4'}
+
   string.prototype.trimend@1.0.6:
     resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
 
   string.prototype.trimend@1.0.7:
     resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
 
+  string.prototype.trimend@1.0.8:
+    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+
   string.prototype.trimstart@1.0.6:
     resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
 
   string.prototype.trimstart@1.0.7:
     resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
 
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+
   string_decoder@0.10.31:
     resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
 
@@ -11727,8 +11310,8 @@ packages:
   swagger-ui-dist@5.11.0:
     resolution: {integrity: sha512-j0PIATqQSEFGOLmiJOJZj1X1Jt6bFIur3JpY7+ghliUnfZs0fpWDdHEkn9q7QUlBtKbkn6TepvSxTqnE8l3s0A==}
 
-  swagger-ui-express@5.0.0:
-    resolution: {integrity: sha512-tsU9tODVvhyfkNSvf03E6FAk+z+5cU3lXAzMy6Pv4av2Gt2xA0++fogwC4qo19XuFf6hdxevPuVCSKFuMHJhFA==}
+  swagger-ui-express@5.0.1:
+    resolution: {integrity: sha512-SrNU3RiBGTLLmFU8GIJdOdanJTl4TOmT27tt3bWWHppqYmAZ6IDuEuBvMU6nZq0zLEe6b/1rACXCgLZqO6ZfrA==}
     engines: {node: '>= v0.10.32'}
     peerDependencies:
       express: '>=4.0.0 || >=5.0.0-beta'
@@ -11759,9 +11342,6 @@ packages:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
 
-  tar-stream@3.1.7:
-    resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==}
-
   tar@6.2.1:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
@@ -11801,9 +11381,6 @@ packages:
     resolution: {integrity: sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==}
     engines: {node: '>=18'}
 
-  text-decoder@1.2.0:
-    resolution: {integrity: sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==}
-
   text-hex@1.0.0:
     resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==}
 
@@ -11929,9 +11506,6 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  traverse@0.3.9:
-    resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
-
   tree-kill@1.2.2:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
@@ -12047,38 +11621,38 @@ packages:
     resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==}
     engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
 
-  turbo-darwin-64@2.0.6:
-    resolution: {integrity: sha512-XpgBwWj3Ggmz/gQVqXdMKXHC1iFPMDiuwugLwSzE7Ih0O13JuNtYZKhQnopvbDQnFQCeRq2Vsm5OTWabg/oB/g==}
+  turbo-darwin-64@2.1.2:
+    resolution: {integrity: sha512-3TEBxHWh99h2yIzkuIigMEOXt/ItYQp0aPiJjPd1xN4oDcsKK5AxiFKPH9pdtfIBzYsY59kQhZiFj0ELnSP7Bw==}
     cpu: [x64]
     os: [darwin]
 
-  turbo-darwin-arm64@2.0.6:
-    resolution: {integrity: sha512-RfeZYXIAkiA21E8lsvfptGTqz/256YD+eI1x37fedfvnHFWuIMFZGAOwJxtZc6QasQunDZ9TRRREbJNI68tkIw==}
+  turbo-darwin-arm64@2.1.2:
+    resolution: {integrity: sha512-he0miWNq2WxJzsH82jS2Z4MXpnkzn9SH8a79iPXiJkq25QREImucscM4RPasXm8wARp91pyysJMq6aasD45CeA==}
     cpu: [arm64]
     os: [darwin]
 
-  turbo-linux-64@2.0.6:
-    resolution: {integrity: sha512-92UDa0xNQQbx0HdSp9ag3YSS3xPdavhc7q9q9mxIAcqyjjD6VElA4Y85m4F/DDGE5SolCrvBz2sQhVmkOd6Caw==}
+  turbo-linux-64@2.1.2:
+    resolution: {integrity: sha512-fKUBcc0rK8Vdqv5a/E3CSpMBLG1bzwv+Q0Q83F8fG2ZfNCNKGbcEYABdonNZkkx141Rj03cZQFCgxu3MVEGU+A==}
     cpu: [x64]
     os: [linux]
 
-  turbo-linux-arm64@2.0.6:
-    resolution: {integrity: sha512-eQKu6utCVUkIH2kqOzD8OS6E0ba6COjWm6PRDTNCHQRljZW503ycaTUIdMOiJrVg1MkEjDyOReUg8s8D18aJ4Q==}
+  turbo-linux-arm64@2.1.2:
+    resolution: {integrity: sha512-sV8Bpmm0WiuxgbhxymcC7wSsuxfBBieI98GegSwbr/bs1ANAgzCg93urIrdKdQ3/b31zZxQwcaP4FBF1wx1Qdg==}
     cpu: [arm64]
     os: [linux]
 
-  turbo-windows-64@2.0.6:
-    resolution: {integrity: sha512-+9u4EPrpoeHYCQ46dRcou9kbkSoelhOelHNcbs2d86D6ruYD/oIAHK9qgYK8LeARRz0jxhZIA/dWYdYsxJJWkw==}
+  turbo-windows-64@2.1.2:
+    resolution: {integrity: sha512-wcmIJZI9ORT9ykHGliFE6kWRQrlH930QGSjSgWC8uFChFFuOyUlvC7ttcxuSvU9VqC7NF4C+GVAcFJQ8lTjN7g==}
     cpu: [x64]
     os: [win32]
 
-  turbo-windows-arm64@2.0.6:
-    resolution: {integrity: sha512-rdrKL+p+EjtdDVg0wQ/7yTbzkIYrnb0Pw4IKcjsy3M0RqUM9UcEi67b94XOAyTa5a0GqJL1+tUj2ebsFGPgZbg==}
+  turbo-windows-arm64@2.1.2:
+    resolution: {integrity: sha512-zdnXjrhk7YO6CP+Q5wPueEvOCLH4lDa6C4rrwiakcWcPgcQGbVozJlo4uaQ6awo8HLWQEvOwu84RkWTdLAc/Hw==}
     cpu: [arm64]
     os: [win32]
 
-  turbo@2.0.6:
-    resolution: {integrity: sha512-/Ftmxd5Mq//a9yMonvmwENNUN65jOVTwhhBPQjEtNZutYT9YKyzydFGLyVM1nzhpLWahQSMamRc/RDBv5EapzA==}
+  turbo@2.1.2:
+    resolution: {integrity: sha512-Jb0rbU4iHEVQ18An/YfakdIv9rKnd3zUfSE117EngrfWXFHo3RndVH96US3GsT8VHpwTncPePDBT2t06PaFLrw==}
     hasBin: true
 
   tween-functions@1.2.0:
@@ -12168,6 +11742,10 @@ packages:
     resolution: {integrity: sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==}
     engines: {node: '>= 0.4'}
 
+  typed-array-length@1.0.6:
+    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
+    engines: {node: '>= 0.4'}
+
   typedarray-dts@1.0.0:
     resolution: {integrity: sha512-Ka0DBegjuV9IPYFT1h0Qqk5U4pccebNIJCGl8C5uU7xtOs+jpJvKGAY4fHGK25hTmXZOEUl9Cnsg5cS6K/b5DA==}
 
@@ -12298,9 +11876,6 @@ packages:
     resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
     engines: {node: '>=8'}
 
-  unzip-stream@0.3.4:
-    resolution: {integrity: sha512-PyofABPVv+d7fL7GOpusx7eRT9YETY2X04PhwbSipdj6bMxVCFJrr+nm0Mxqbf9hUiTin/UsnuFWBXlDZFy0Cw==}
-
   update-browserslist-db@1.0.13:
     resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
     hasBin: true
@@ -12316,6 +11891,9 @@ packages:
   upper-case@2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
 
+  uri-js-replace@1.0.1:
+    resolution: {integrity: sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==}
+
   uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
@@ -12332,6 +11910,11 @@ packages:
     resolution: {integrity: sha512-yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A==}
     engines: {node: '>=6.0.0'}
 
+  use-sync-external-store@1.2.2:
+    resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
   utf7@1.0.2:
     resolution: {integrity: sha512-qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw==}
 
@@ -12395,13 +11978,13 @@ packages:
     resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
     engines: {'0': node >=0.6.0}
 
-  vite-node@2.1.1:
-    resolution: {integrity: sha512-N/mGckI1suG/5wQI35XeR9rsMsPqKXzq1CdUndzVstBj/HvyxxGctwnK6WX43NGt5L3Z5tcRf83g4TITKJhPrA==}
+  vite-node@2.1.2:
+    resolution: {integrity: sha512-HPcGNN5g/7I2OtPjLqgOtCRu/qhVvBxTUD3qzitmL0SrG1cWFzxzhMDWussxSbrRYWqnKf8P2jiNhPMSN+ymsQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
 
-  vite-plugin-dts@3.9.1:
-    resolution: {integrity: sha512-rVp2KM9Ue22NGWB8dNtWEr+KekN3rIgz1tWD050QnRGlriUCmaDwa7qA5zDEjbXg5lAXhYMSBJtx3q3hQIJZSg==}
+  vite-plugin-dts@4.2.3:
+    resolution: {integrity: sha512-O5NalzHANQRwVw1xj8KQun3Bv8OSDAlNJXrnqoAz10BOuW8FVvY5g4ygj+DlJZL5mtSPuMu9vd3OfrdW5d4k6w==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       typescript: ^5.6.2
@@ -12410,8 +11993,8 @@ packages:
       vite:
         optional: true
 
-  vite@5.4.6:
-    resolution: {integrity: sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==}
+  vite@5.4.8:
+    resolution: {integrity: sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -12447,15 +12030,15 @@ packages:
       typescript: ^5.6.2
       vitest: '>=2.0.0'
 
-  vitest@2.1.1:
-    resolution: {integrity: sha512-97We7/VC0e9X5zBVkvt7SGQMGrRtn3KtySFQG5fpaMlS+l62eeXRQO633AYhSTC3z7IMebnPPNjGXVGNRFlxBA==}
+  vitest@2.1.2:
+    resolution: {integrity: sha512-veNjLizOMkRrJ6xxb+pvxN6/QAWg95mzcRjtmkepXdN87FNfxAss9RKe2far/G9cQpipfgP2taqg0KiWsquj8A==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@types/node': ^18.16.16
-      '@vitest/browser': 2.1.1
-      '@vitest/ui': 2.1.1
+      '@vitest/browser': 2.1.2
+      '@vitest/ui': 2.1.2
       happy-dom: '*'
       jsdom: '*'
     peerDependenciesMeta:
@@ -12476,6 +12059,9 @@ packages:
     resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
     engines: {node: '>=0.10.0'}
 
+  vscode-uri@3.0.8:
+    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
+
   vue-agile@2.0.0:
     resolution: {integrity: sha512-5xkSLJQNRdQ7qpEnXj5FgLg33XKRHaTZKGP5qkvteOc/uGJX89MYCjPSgdNqJ1GYFGfdGAp0jvhihW8OMuXS3g==}
 
@@ -12490,36 +12076,19 @@ packages:
       chart.js: ^4.1.1
       vue: ^3.0.0-0 || ^2.7.0
 
-  vue-component-meta@2.0.19:
-    resolution: {integrity: sha512-Iv6VWXnlkUyJZvgadxYLcZajb58qUuIrQUePGbm0yZQEKMTb2T09UK57hz35TU4lb7zobierICDKvzInEpOGpg==}
+  vue-component-meta@2.1.6:
+    resolution: {integrity: sha512-N5zReatWQTNqULhatFib69K82g5UhDERVobeqrT5S6Uk2QoCeYbsSY8nHRUwJFywE2iXRFN4B+XPhI+piZfC6w==}
     peerDependencies:
       typescript: ^5.6.2
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  vue-component-type-helpers@1.8.25:
-    resolution: {integrity: sha512-NCA6sekiJIMnMs4DdORxATXD+/NRkQpS32UC+I1KQJUasx+Z7MZUb3Y+MsKsFmX+PgyTYSteb73JW77AibaCCw==}
-
-  vue-component-type-helpers@2.0.19:
-    resolution: {integrity: sha512-cN3f1aTxxKo4lzNeQAkVopswuImUrb5Iurll9Gaw5cqpnbTAxtEMM1mgi6ou4X79OCyqYv1U1mzBHJkzmiK82w==}
-
   vue-component-type-helpers@2.1.6:
     resolution: {integrity: sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==}
 
-  vue-demi@0.14.5:
-    resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==}
-    engines: {node: '>=12'}
-    hasBin: true
-    peerDependencies:
-      '@vue/composition-api': ^1.0.0-rc.1
-      vue: ^3.0.0-0 || ^2.6.0
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
-
-  vue-demi@0.14.8:
-    resolution: {integrity: sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==}
+  vue-demi@0.14.10:
+    resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
     engines: {node: '>=12'}
     hasBin: true
     peerDependencies:
@@ -12562,22 +12131,13 @@ packages:
     peerDependencies:
       vue: ^3.3.4
 
-  vue-router@4.4.2:
-    resolution: {integrity: sha512-1qNybkn2L7QsLzaXs8nvlQmRKp8XF8DCxZys/Jr1JpQcHsKUxTKzTxCVA1G7NfBfwRIBgCJPoujOG5lHCCNUxw==}
+  vue-router@4.4.5:
+    resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==}
     peerDependencies:
       vue: ^3.2.0
 
-  vue-template-compiler@2.7.14:
-    resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==}
-
-  vue-tsc@1.8.27:
-    resolution: {integrity: sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==}
-    hasBin: true
-    peerDependencies:
-      typescript: ^5.6.2
-
-  vue-tsc@2.0.19:
-    resolution: {integrity: sha512-JWay5Zt2/871iodGF72cELIbcAoPyhJxq56mPPh+M2K7IwI688FMrFKc/+DvB05wDWEuCPexQJ6L10zSwzzapg==}
+  vue-tsc@2.1.6:
+    resolution: {integrity: sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==}
     hasBin: true
     peerDependencies:
       typescript: ^5.6.2
@@ -12585,8 +12145,8 @@ packages:
   vue3-touch-events@4.1.3:
     resolution: {integrity: sha512-uXTclRzn7de1mgiDIZ8N4J/wnWl1vBPLTWr60fqoLXu7ifhDKpl83Q2m9qA20KfEiAy+L4X/xXGc5ptGmdPh4A==}
 
-  vue@3.4.21:
-    resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==}
+  vue@3.5.11:
+    resolution: {integrity: sha512-/8Wurrd9J3lb72FTQS7gRMNQD4nztTtKPmuDuPuhqXmmpD6+skVjAeahNpVzsuky6Sy9gy7wn8UadqPtt9SQIg==}
     peerDependencies:
       typescript: ^5.6.2
     peerDependenciesMeta:
@@ -12706,12 +12266,12 @@ packages:
     resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==}
     engines: {node: '>=8'}
 
-  winston-transport@4.5.0:
-    resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==}
-    engines: {node: '>= 6.4.0'}
+  winston-transport@4.8.0:
+    resolution: {integrity: sha512-qxSTKswC6llEMZKgCQdaWgDuMJQnhuvF5f2Nk3SNXc4byfQ+voo2mX1Px9dkNOuR8p0KAjfPG29PuYUSIb+vSA==}
+    engines: {node: '>= 12.0.0'}
 
-  winston@3.8.2:
-    resolution: {integrity: sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==}
+  winston@3.14.2:
+    resolution: {integrity: sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==}
     engines: {node: '>= 12.0.0'}
 
   with@7.0.2:
@@ -12892,15 +12452,6 @@ packages:
     resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
     engines: {node: '>=10'}
 
-  z-schema@5.0.5:
-    resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
-    engines: {node: '>=8.0.0'}
-    hasBin: true
-
-  zip-stream@6.0.1:
-    resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==}
-    engines: {node: '>= 14'}
-
   zod-class@0.0.15:
     resolution: {integrity: sha512-CD5B4e9unKPj1hiy7JOSwRV01WqbEBkFOlhws0C9s9wB0FSpECOnlKXOAkjo9tKYX2enQsXWyyOIBNPPNUHWRA==}
     peerDependencies:
@@ -12926,7 +12477,7 @@ snapshots:
   '@acuminous/bitsyntax@0.1.2':
     dependencies:
       buffer-more-ints: 1.0.0
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       safe-buffer: 5.1.2
     transitivePeerDependencies:
       - supports-color
@@ -12979,44 +12530,28 @@ snapshots:
   '@aws-crypto/crc32@3.0.0':
     dependencies:
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/types': 3.664.0
       tslib: 2.6.2
 
   '@aws-crypto/crc32@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.654.0
+      '@aws-sdk/types': 3.664.0
       tslib: 2.6.2
 
-  '@aws-crypto/crc32c@3.0.0':
+  '@aws-crypto/crc32c@5.2.0':
     dependencies:
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.609.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.664.0
       tslib: 2.6.2
 
-  '@aws-crypto/ie11-detection@3.0.0':
+  '@aws-crypto/sha1-browser@5.2.0':
     dependencies:
-      tslib: 2.6.2
-
-  '@aws-crypto/sha1-browser@3.0.0':
-    dependencies:
-      '@aws-crypto/ie11-detection': 3.0.0
-      '@aws-crypto/supports-web-crypto': 3.0.0
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.609.0
+      '@aws-crypto/supports-web-crypto': 5.2.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.664.0
       '@aws-sdk/util-locate-window': 3.310.0
-      '@aws-sdk/util-utf8-browser': 3.259.0
-      tslib: 2.6.2
-
-  '@aws-crypto/sha256-browser@3.0.0':
-    dependencies:
-      '@aws-crypto/ie11-detection': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-crypto/supports-web-crypto': 3.0.0
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-locate-window': 3.310.0
-      '@aws-sdk/util-utf8-browser': 3.259.0
+      '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
   '@aws-crypto/sha256-browser@5.2.0':
@@ -13024,25 +12559,15 @@ snapshots:
       '@aws-crypto/sha256-js': 5.2.0
       '@aws-crypto/supports-web-crypto': 5.2.0
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/types': 3.664.0
       '@aws-sdk/util-locate-window': 3.310.0
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
-  '@aws-crypto/sha256-js@3.0.0':
-    dependencies:
-      '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.609.0
-      tslib: 2.6.2
-
   '@aws-crypto/sha256-js@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.609.0
-      tslib: 2.6.2
-
-  '@aws-crypto/supports-web-crypto@3.0.0':
-    dependencies:
+      '@aws-sdk/types': 3.664.0
       tslib: 2.6.2
 
   '@aws-crypto/supports-web-crypto@5.2.0':
@@ -13051,1311 +12576,671 @@ snapshots:
 
   '@aws-crypto/util@3.0.0':
     dependencies:
-      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/types': 3.664.0
       '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 2.6.2
 
   '@aws-crypto/util@5.2.0':
     dependencies:
-      '@aws-sdk/types': 3.609.0
+      '@aws-sdk/types': 3.664.0
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
 
-  '@aws-sdk/client-bedrock-agent-runtime@3.654.0':
+  '@aws-sdk/client-bedrock-agent-runtime@3.666.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.654.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/client-sts': 3.654.0
-      '@aws-sdk/core': 3.654.0
-      '@aws-sdk/credential-provider-node': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/middleware-host-header': 3.654.0
-      '@aws-sdk/middleware-logger': 3.654.0
-      '@aws-sdk/middleware-recursion-detection': 3.654.0
-      '@aws-sdk/middleware-user-agent': 3.654.0
-      '@aws-sdk/region-config-resolver': 3.654.0
-      '@aws-sdk/types': 3.654.0
-      '@aws-sdk/util-endpoints': 3.654.0
-      '@aws-sdk/util-user-agent-browser': 3.654.0
-      '@aws-sdk/util-user-agent-node': 3.654.0
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/core': 2.4.5
-      '@smithy/eventstream-serde-browser': 3.0.9
-      '@smithy/eventstream-serde-config-resolver': 3.0.6
-      '@smithy/eventstream-serde-node': 3.0.8
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/hash-node': 3.0.6
-      '@smithy/invalid-dependency': 3.0.6
-      '@smithy/middleware-content-length': 3.0.8
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
+      '@aws-sdk/client-sso-oidc': 3.666.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/eventstream-serde-browser': 3.0.10
+      '@smithy/eventstream-serde-config-resolver': 3.0.7
+      '@smithy/eventstream-serde-node': 3.0.9
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-node': 3.0.7
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.20
-      '@smithy/util-defaults-mode-node': 3.0.20
-      '@smithy/util-endpoints': 2.1.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-bedrock-runtime@3.645.0':
+  '@aws-sdk/client-bedrock-runtime@3.666.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.645.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/core': 3.635.0
-      '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/middleware-host-header': 3.620.0
-      '@aws-sdk/middleware-logger': 3.609.0
-      '@aws-sdk/middleware-recursion-detection': 3.620.0
-      '@aws-sdk/middleware-user-agent': 3.645.0
-      '@aws-sdk/region-config-resolver': 3.614.0
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-endpoints': 3.645.0
-      '@aws-sdk/util-user-agent-browser': 3.609.0
-      '@aws-sdk/util-user-agent-node': 3.614.0
-      '@smithy/config-resolver': 3.0.5
-      '@smithy/core': 2.4.0
-      '@smithy/eventstream-serde-browser': 3.0.6
-      '@smithy/eventstream-serde-config-resolver': 3.0.3
-      '@smithy/eventstream-serde-node': 3.0.5
-      '@smithy/fetch-http-handler': 3.2.4
-      '@smithy/hash-node': 3.0.3
-      '@smithy/invalid-dependency': 3.0.3
-      '@smithy/middleware-content-length': 3.0.5
-      '@smithy/middleware-endpoint': 3.1.0
-      '@smithy/middleware-retry': 3.0.15
-      '@smithy/middleware-serde': 3.0.3
-      '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/node-http-handler': 3.1.4
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      '@smithy/url-parser': 3.0.3
+      '@aws-sdk/client-sso-oidc': 3.666.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/eventstream-serde-browser': 3.0.10
+      '@smithy/eventstream-serde-config-resolver': 3.0.7
+      '@smithy/eventstream-serde-node': 3.0.9
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-node': 3.0.7
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.15
-      '@smithy/util-defaults-mode-node': 3.0.15
-      '@smithy/util-endpoints': 2.0.5
-      '@smithy/util-middleware': 3.0.3
-      '@smithy/util-retry': 3.0.3
-      '@smithy/util-stream': 3.1.3
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
+      '@smithy/util-stream': 3.1.9
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-cognito-identity@3.645.0':
+  '@aws-sdk/client-cognito-identity@3.666.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.645.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/core': 3.635.0
-      '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/middleware-host-header': 3.620.0
-      '@aws-sdk/middleware-logger': 3.609.0
-      '@aws-sdk/middleware-recursion-detection': 3.620.0
-      '@aws-sdk/middleware-user-agent': 3.645.0
-      '@aws-sdk/region-config-resolver': 3.614.0
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-endpoints': 3.645.0
-      '@aws-sdk/util-user-agent-browser': 3.609.0
-      '@aws-sdk/util-user-agent-node': 3.614.0
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/core': 2.4.5
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/hash-node': 3.0.6
-      '@smithy/invalid-dependency': 3.0.6
-      '@smithy/middleware-content-length': 3.0.8
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
+      '@aws-sdk/client-sso-oidc': 3.666.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-node': 3.0.7
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.20
-      '@smithy/util-defaults-mode-node': 3.0.20
-      '@smithy/util-endpoints': 2.1.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-kendra@3.654.0':
+  '@aws-sdk/client-kendra@3.666.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.654.0(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/client-sts': 3.654.0
-      '@aws-sdk/core': 3.654.0
-      '@aws-sdk/credential-provider-node': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/middleware-host-header': 3.654.0
-      '@aws-sdk/middleware-logger': 3.654.0
-      '@aws-sdk/middleware-recursion-detection': 3.654.0
-      '@aws-sdk/middleware-user-agent': 3.654.0
-      '@aws-sdk/region-config-resolver': 3.654.0
-      '@aws-sdk/types': 3.654.0
-      '@aws-sdk/util-endpoints': 3.654.0
-      '@aws-sdk/util-user-agent-browser': 3.654.0
-      '@aws-sdk/util-user-agent-node': 3.654.0
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/core': 2.4.5
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/hash-node': 3.0.6
-      '@smithy/invalid-dependency': 3.0.6
-      '@smithy/middleware-content-length': 3.0.8
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
+      '@aws-sdk/client-sso-oidc': 3.666.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-node': 3.0.7
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.20
-      '@smithy/util-defaults-mode-node': 3.0.20
-      '@smithy/util-endpoints': 2.1.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
       uuid: 9.0.1
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-s3@3.478.0':
+  '@aws-sdk/client-s3@3.666.0':
     dependencies:
-      '@aws-crypto/sha1-browser': 3.0.0
-      '@aws-crypto/sha256-browser': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sts': 3.478.0
-      '@aws-sdk/core': 3.477.0
-      '@aws-sdk/credential-provider-node': 3.478.0
-      '@aws-sdk/middleware-bucket-endpoint': 3.470.0
-      '@aws-sdk/middleware-expect-continue': 3.468.0
-      '@aws-sdk/middleware-flexible-checksums': 3.468.0
-      '@aws-sdk/middleware-host-header': 3.468.0
-      '@aws-sdk/middleware-location-constraint': 3.468.0
-      '@aws-sdk/middleware-logger': 3.468.0
-      '@aws-sdk/middleware-recursion-detection': 3.468.0
-      '@aws-sdk/middleware-sdk-s3': 3.474.0
-      '@aws-sdk/middleware-signing': 3.468.0
-      '@aws-sdk/middleware-ssec': 3.468.0
-      '@aws-sdk/middleware-user-agent': 3.478.0
-      '@aws-sdk/region-config-resolver': 3.470.0
-      '@aws-sdk/signature-v4-multi-region': 3.474.0
-      '@aws-sdk/types': 3.468.0
-      '@aws-sdk/util-endpoints': 3.478.0
-      '@aws-sdk/util-user-agent-browser': 3.468.0
-      '@aws-sdk/util-user-agent-node': 3.470.0
-      '@aws-sdk/xml-builder': 3.472.0
-      '@smithy/config-resolver': 2.2.0
-      '@smithy/core': 1.4.2
-      '@smithy/eventstream-serde-browser': 2.2.0
-      '@smithy/eventstream-serde-config-resolver': 2.2.0
-      '@smithy/eventstream-serde-node': 2.2.0
-      '@smithy/fetch-http-handler': 2.5.0
-      '@smithy/hash-blob-browser': 2.0.16
-      '@smithy/hash-node': 2.2.0
-      '@smithy/hash-stream-node': 2.0.17
-      '@smithy/invalid-dependency': 2.2.0
-      '@smithy/md5-js': 2.0.17
-      '@smithy/middleware-content-length': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
-      '@smithy/middleware-retry': 2.3.1
-      '@smithy/middleware-serde': 2.3.0
-      '@smithy/middleware-stack': 2.2.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      '@smithy/url-parser': 2.2.0
-      '@smithy/util-base64': 2.3.0
-      '@smithy/util-body-length-browser': 2.2.0
-      '@smithy/util-body-length-node': 2.3.0
-      '@smithy/util-defaults-mode-browser': 2.2.1
-      '@smithy/util-defaults-mode-node': 2.3.1
-      '@smithy/util-endpoints': 1.2.0
-      '@smithy/util-retry': 2.2.0
-      '@smithy/util-stream': 2.2.0
-      '@smithy/util-utf8': 2.3.0
-      '@smithy/util-waiter': 2.0.15
-      fast-xml-parser: 4.2.5
+      '@aws-crypto/sha1-browser': 5.2.0
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/client-sso-oidc': 3.666.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/middleware-bucket-endpoint': 3.664.0
+      '@aws-sdk/middleware-expect-continue': 3.664.0
+      '@aws-sdk/middleware-flexible-checksums': 3.666.0
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-location-constraint': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-sdk-s3': 3.666.0
+      '@aws-sdk/middleware-ssec': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/signature-v4-multi-region': 3.666.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@aws-sdk/xml-builder': 3.662.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/eventstream-serde-browser': 3.0.10
+      '@smithy/eventstream-serde-config-resolver': 3.0.7
+      '@smithy/eventstream-serde-node': 3.0.9
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-blob-browser': 3.1.6
+      '@smithy/hash-node': 3.0.7
+      '@smithy/hash-stream-node': 3.1.6
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/md5-js': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
+      '@smithy/util-base64': 3.0.0
+      '@smithy/util-body-length-browser': 3.0.0
+      '@smithy/util-body-length-node': 3.0.0
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
+      '@smithy/util-stream': 3.1.9
+      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-waiter': 3.1.6
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sagemaker@3.646.0':
+  '@aws-sdk/client-sagemaker@3.666.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.645.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/core': 3.635.0
-      '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/middleware-host-header': 3.620.0
-      '@aws-sdk/middleware-logger': 3.609.0
-      '@aws-sdk/middleware-recursion-detection': 3.620.0
-      '@aws-sdk/middleware-user-agent': 3.645.0
-      '@aws-sdk/region-config-resolver': 3.614.0
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-endpoints': 3.645.0
-      '@aws-sdk/util-user-agent-browser': 3.609.0
-      '@aws-sdk/util-user-agent-node': 3.614.0
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/core': 2.4.5
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/hash-node': 3.0.6
-      '@smithy/invalid-dependency': 3.0.6
-      '@smithy/middleware-content-length': 3.0.8
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
+      '@aws-sdk/client-sso-oidc': 3.666.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-node': 3.0.7
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.20
-      '@smithy/util-defaults-mode-node': 3.0.20
-      '@smithy/util-endpoints': 2.1.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
       '@smithy/util-utf8': 3.0.0
-      '@smithy/util-waiter': 3.1.2
+      '@smithy/util-waiter': 3.1.6
       tslib: 2.6.2
       uuid: 9.0.1
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0)':
+  '@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0)':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/core': 3.635.0
-      '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/middleware-host-header': 3.620.0
-      '@aws-sdk/middleware-logger': 3.609.0
-      '@aws-sdk/middleware-recursion-detection': 3.620.0
-      '@aws-sdk/middleware-user-agent': 3.645.0
-      '@aws-sdk/region-config-resolver': 3.614.0
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-endpoints': 3.645.0
-      '@aws-sdk/util-user-agent-browser': 3.609.0
-      '@aws-sdk/util-user-agent-node': 3.614.0
-      '@smithy/config-resolver': 3.0.5
-      '@smithy/core': 2.4.0
-      '@smithy/fetch-http-handler': 3.2.4
-      '@smithy/hash-node': 3.0.3
-      '@smithy/invalid-dependency': 3.0.3
-      '@smithy/middleware-content-length': 3.0.5
-      '@smithy/middleware-endpoint': 3.1.0
-      '@smithy/middleware-retry': 3.0.15
-      '@smithy/middleware-serde': 3.0.3
-      '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/node-http-handler': 3.1.4
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      '@smithy/url-parser': 3.0.3
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-node': 3.0.7
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.15
-      '@smithy/util-defaults-mode-node': 3.0.15
-      '@smithy/util-endpoints': 2.0.5
-      '@smithy/util-middleware': 3.0.3
-      '@smithy/util-retry': 3.0.3
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0)':
+  '@aws-sdk/client-sso@3.666.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/core': 3.654.0
-      '@aws-sdk/credential-provider-node': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/middleware-host-header': 3.654.0
-      '@aws-sdk/middleware-logger': 3.654.0
-      '@aws-sdk/middleware-recursion-detection': 3.654.0
-      '@aws-sdk/middleware-user-agent': 3.654.0
-      '@aws-sdk/region-config-resolver': 3.654.0
-      '@aws-sdk/types': 3.654.0
-      '@aws-sdk/util-endpoints': 3.654.0
-      '@aws-sdk/util-user-agent-browser': 3.654.0
-      '@aws-sdk/util-user-agent-node': 3.654.0
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/core': 2.4.5
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/hash-node': 3.0.6
-      '@smithy/invalid-dependency': 3.0.6
-      '@smithy/middleware-content-length': 3.0.8
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-node': 3.0.7
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.20
-      '@smithy/util-defaults-mode-node': 3.0.20
-      '@smithy/util-endpoints': 2.1.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0)':
+  '@aws-sdk/client-sts@3.666.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sts': 3.654.0
-      '@aws-sdk/core': 3.654.0
-      '@aws-sdk/credential-provider-node': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/middleware-host-header': 3.654.0
-      '@aws-sdk/middleware-logger': 3.654.0
-      '@aws-sdk/middleware-recursion-detection': 3.654.0
-      '@aws-sdk/middleware-user-agent': 3.654.0
-      '@aws-sdk/region-config-resolver': 3.654.0
-      '@aws-sdk/types': 3.654.0
-      '@aws-sdk/util-endpoints': 3.654.0
-      '@aws-sdk/util-user-agent-browser': 3.654.0
-      '@aws-sdk/util-user-agent-node': 3.654.0
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/core': 2.4.5
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/hash-node': 3.0.6
-      '@smithy/invalid-dependency': 3.0.6
-      '@smithy/middleware-content-length': 3.0.8
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
+      '@aws-sdk/client-sso-oidc': 3.666.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/middleware-host-header': 3.664.0
+      '@aws-sdk/middleware-logger': 3.664.0
+      '@aws-sdk/middleware-recursion-detection': 3.664.0
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/region-config-resolver': 3.664.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@aws-sdk/util-user-agent-browser': 3.664.0
+      '@aws-sdk/util-user-agent-node': 3.666.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/core': 2.4.8
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/hash-node': 3.0.7
+      '@smithy/invalid-dependency': 3.0.7
+      '@smithy/middleware-content-length': 3.0.9
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       '@smithy/util-base64': 3.0.0
       '@smithy/util-body-length-browser': 3.0.0
       '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.20
-      '@smithy/util-defaults-mode-node': 3.0.20
-      '@smithy/util-endpoints': 2.1.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
+      '@smithy/util-defaults-mode-browser': 3.0.23
+      '@smithy/util-defaults-mode-node': 3.0.23
+      '@smithy/util-endpoints': 2.1.3
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso@3.478.0':
+  '@aws-sdk/core@3.666.0':
     dependencies:
-      '@aws-crypto/sha256-browser': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/core': 3.477.0
-      '@aws-sdk/middleware-host-header': 3.468.0
-      '@aws-sdk/middleware-logger': 3.468.0
-      '@aws-sdk/middleware-recursion-detection': 3.468.0
-      '@aws-sdk/middleware-user-agent': 3.478.0
-      '@aws-sdk/region-config-resolver': 3.470.0
-      '@aws-sdk/types': 3.468.0
-      '@aws-sdk/util-endpoints': 3.478.0
-      '@aws-sdk/util-user-agent-browser': 3.468.0
-      '@aws-sdk/util-user-agent-node': 3.470.0
-      '@smithy/config-resolver': 2.2.0
-      '@smithy/core': 1.4.2
-      '@smithy/fetch-http-handler': 2.5.0
-      '@smithy/hash-node': 2.2.0
-      '@smithy/invalid-dependency': 2.2.0
-      '@smithy/middleware-content-length': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
-      '@smithy/middleware-retry': 2.3.1
-      '@smithy/middleware-serde': 2.3.0
-      '@smithy/middleware-stack': 2.2.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      '@smithy/url-parser': 2.2.0
-      '@smithy/util-base64': 2.3.0
-      '@smithy/util-body-length-browser': 2.2.0
-      '@smithy/util-body-length-node': 2.3.0
-      '@smithy/util-defaults-mode-browser': 2.2.1
-      '@smithy/util-defaults-mode-node': 2.3.1
-      '@smithy/util-endpoints': 1.2.0
-      '@smithy/util-retry': 2.2.0
-      '@smithy/util-utf8': 2.3.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/client-sso@3.645.0':
-    dependencies:
-      '@aws-crypto/sha256-browser': 5.2.0
-      '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/core': 3.635.0
-      '@aws-sdk/middleware-host-header': 3.620.0
-      '@aws-sdk/middleware-logger': 3.609.0
-      '@aws-sdk/middleware-recursion-detection': 3.620.0
-      '@aws-sdk/middleware-user-agent': 3.645.0
-      '@aws-sdk/region-config-resolver': 3.614.0
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-endpoints': 3.645.0
-      '@aws-sdk/util-user-agent-browser': 3.609.0
-      '@aws-sdk/util-user-agent-node': 3.614.0
-      '@smithy/config-resolver': 3.0.5
-      '@smithy/core': 2.4.0
-      '@smithy/fetch-http-handler': 3.2.4
-      '@smithy/hash-node': 3.0.3
-      '@smithy/invalid-dependency': 3.0.3
-      '@smithy/middleware-content-length': 3.0.5
-      '@smithy/middleware-endpoint': 3.1.0
-      '@smithy/middleware-retry': 3.0.15
-      '@smithy/middleware-serde': 3.0.3
-      '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/node-http-handler': 3.1.4
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      '@smithy/url-parser': 3.0.3
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.15
-      '@smithy/util-defaults-mode-node': 3.0.15
-      '@smithy/util-endpoints': 2.0.5
-      '@smithy/util-middleware': 3.0.3
-      '@smithy/util-retry': 3.0.3
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/client-sso@3.654.0':
-    dependencies:
-      '@aws-crypto/sha256-browser': 5.2.0
-      '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/core': 3.654.0
-      '@aws-sdk/middleware-host-header': 3.654.0
-      '@aws-sdk/middleware-logger': 3.654.0
-      '@aws-sdk/middleware-recursion-detection': 3.654.0
-      '@aws-sdk/middleware-user-agent': 3.654.0
-      '@aws-sdk/region-config-resolver': 3.654.0
-      '@aws-sdk/types': 3.654.0
-      '@aws-sdk/util-endpoints': 3.654.0
-      '@aws-sdk/util-user-agent-browser': 3.654.0
-      '@aws-sdk/util-user-agent-node': 3.654.0
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/core': 2.4.5
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/hash-node': 3.0.6
-      '@smithy/invalid-dependency': 3.0.6
-      '@smithy/middleware-content-length': 3.0.8
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.20
-      '@smithy/util-defaults-mode-node': 3.0.20
-      '@smithy/util-endpoints': 2.1.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/client-sts@3.478.0':
-    dependencies:
-      '@aws-crypto/sha256-browser': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/core': 3.477.0
-      '@aws-sdk/credential-provider-node': 3.478.0
-      '@aws-sdk/middleware-host-header': 3.468.0
-      '@aws-sdk/middleware-logger': 3.468.0
-      '@aws-sdk/middleware-recursion-detection': 3.468.0
-      '@aws-sdk/middleware-user-agent': 3.478.0
-      '@aws-sdk/region-config-resolver': 3.470.0
-      '@aws-sdk/types': 3.468.0
-      '@aws-sdk/util-endpoints': 3.478.0
-      '@aws-sdk/util-user-agent-browser': 3.468.0
-      '@aws-sdk/util-user-agent-node': 3.470.0
-      '@smithy/config-resolver': 2.2.0
-      '@smithy/core': 1.4.2
-      '@smithy/fetch-http-handler': 2.5.0
-      '@smithy/hash-node': 2.2.0
-      '@smithy/invalid-dependency': 2.2.0
-      '@smithy/middleware-content-length': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
-      '@smithy/middleware-retry': 2.3.1
-      '@smithy/middleware-serde': 2.3.0
-      '@smithy/middleware-stack': 2.2.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      '@smithy/url-parser': 2.2.0
-      '@smithy/util-base64': 2.3.0
-      '@smithy/util-body-length-browser': 2.2.0
-      '@smithy/util-body-length-node': 2.3.0
-      '@smithy/util-defaults-mode-browser': 2.2.1
-      '@smithy/util-defaults-mode-node': 2.3.1
-      '@smithy/util-endpoints': 1.2.0
-      '@smithy/util-middleware': 2.2.0
-      '@smithy/util-retry': 2.2.0
-      '@smithy/util-utf8': 2.3.0
-      fast-xml-parser: 4.2.5
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/client-sts@3.645.0':
-    dependencies:
-      '@aws-crypto/sha256-browser': 5.2.0
-      '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.645.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/core': 3.635.0
-      '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/middleware-host-header': 3.620.0
-      '@aws-sdk/middleware-logger': 3.609.0
-      '@aws-sdk/middleware-recursion-detection': 3.620.0
-      '@aws-sdk/middleware-user-agent': 3.645.0
-      '@aws-sdk/region-config-resolver': 3.614.0
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-endpoints': 3.645.0
-      '@aws-sdk/util-user-agent-browser': 3.609.0
-      '@aws-sdk/util-user-agent-node': 3.614.0
-      '@smithy/config-resolver': 3.0.5
-      '@smithy/core': 2.4.0
-      '@smithy/fetch-http-handler': 3.2.4
-      '@smithy/hash-node': 3.0.3
-      '@smithy/invalid-dependency': 3.0.3
-      '@smithy/middleware-content-length': 3.0.5
-      '@smithy/middleware-endpoint': 3.1.0
-      '@smithy/middleware-retry': 3.0.15
-      '@smithy/middleware-serde': 3.0.3
-      '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/node-http-handler': 3.1.4
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      '@smithy/url-parser': 3.0.3
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.15
-      '@smithy/util-defaults-mode-node': 3.0.15
-      '@smithy/util-endpoints': 2.0.5
-      '@smithy/util-middleware': 3.0.3
-      '@smithy/util-retry': 3.0.3
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/client-sts@3.654.0':
-    dependencies:
-      '@aws-crypto/sha256-browser': 5.2.0
-      '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.654.0(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/core': 3.654.0
-      '@aws-sdk/credential-provider-node': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/middleware-host-header': 3.654.0
-      '@aws-sdk/middleware-logger': 3.654.0
-      '@aws-sdk/middleware-recursion-detection': 3.654.0
-      '@aws-sdk/middleware-user-agent': 3.654.0
-      '@aws-sdk/region-config-resolver': 3.654.0
-      '@aws-sdk/types': 3.654.0
-      '@aws-sdk/util-endpoints': 3.654.0
-      '@aws-sdk/util-user-agent-browser': 3.654.0
-      '@aws-sdk/util-user-agent-node': 3.654.0
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/core': 2.4.5
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/hash-node': 3.0.6
-      '@smithy/invalid-dependency': 3.0.6
-      '@smithy/middleware-content-length': 3.0.8
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.20
-      '@smithy/util-defaults-mode-node': 3.0.20
-      '@smithy/util-endpoints': 2.1.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/core@3.477.0':
-    dependencies:
-      '@smithy/core': 1.4.2
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/signature-v4': 2.2.1
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@aws-sdk/core@3.635.0':
-    dependencies:
-      '@smithy/core': 2.4.0
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/property-provider': 3.1.3
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/signature-v4': 4.1.0
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      '@smithy/util-middleware': 3.0.3
+      '@aws-sdk/types': 3.664.0
+      '@smithy/core': 2.4.8
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/property-provider': 3.1.7
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/signature-v4': 4.2.0
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/util-middleware': 3.0.7
       fast-xml-parser: 4.4.1
       tslib: 2.6.2
 
-  '@aws-sdk/core@3.654.0':
+  '@aws-sdk/credential-provider-cognito-identity@3.666.0':
     dependencies:
-      '@smithy/core': 2.4.5
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/property-provider': 3.1.6
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/signature-v4': 4.1.4
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/util-middleware': 3.0.6
-      fast-xml-parser: 4.4.1
-      tslib: 2.6.2
-
-  '@aws-sdk/credential-provider-cognito-identity@3.645.0':
-    dependencies:
-      '@aws-sdk/client-cognito-identity': 3.645.0
-      '@aws-sdk/types': 3.609.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/types': 3.4.2
+      '@aws-sdk/client-cognito-identity': 3.666.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/property-provider': 3.1.7
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/credential-provider-env@3.468.0':
+  '@aws-sdk/credential-provider-env@3.664.0':
     dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/types': 2.12.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/property-provider': 3.1.7
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-env@3.620.1':
+  '@aws-sdk/credential-provider-http@3.666.0':
     dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/types': 3.3.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/property-provider': 3.1.7
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/util-stream': 3.1.9
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-env@3.654.0':
+  '@aws-sdk/credential-provider-ini@3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)':
     dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@aws-sdk/credential-provider-http@3.635.0':
-    dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/fetch-http-handler': 3.2.4
-      '@smithy/node-http-handler': 3.1.4
-      '@smithy/property-provider': 3.1.3
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      '@smithy/util-stream': 3.1.3
-      tslib: 2.6.2
-
-  '@aws-sdk/credential-provider-http@3.654.0':
-    dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/property-provider': 3.1.6
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/util-stream': 3.1.8
-      tslib: 2.6.2
-
-  '@aws-sdk/credential-provider-ini@3.478.0':
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.468.0
-      '@aws-sdk/credential-provider-process': 3.468.0
-      '@aws-sdk/credential-provider-sso': 3.478.0
-      '@aws-sdk/credential-provider-web-identity': 3.468.0
-      '@aws-sdk/types': 3.468.0
-      '@smithy/credential-provider-imds': 2.3.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/shared-ini-file-loader': 2.4.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/credential-provider-ini@3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)':
-    dependencies:
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/credential-provider-env': 3.620.1
-      '@aws-sdk/credential-provider-http': 3.635.0
-      '@aws-sdk/credential-provider-process': 3.620.1
-      '@aws-sdk/credential-provider-sso': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))
-      '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/credential-provider-imds': 3.2.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/credential-provider-env': 3.664.0
+      '@aws-sdk/credential-provider-http': 3.666.0
+      '@aws-sdk/credential-provider-process': 3.664.0
+      '@aws-sdk/credential-provider-sso': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))
+      '@aws-sdk/credential-provider-web-identity': 3.664.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/types': 3.664.0
+      '@smithy/credential-provider-imds': 3.2.4
+      '@smithy/property-provider': 3.1.7
+      '@smithy/shared-ini-file-loader': 3.1.8
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/credential-provider-ini@3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)':
+  '@aws-sdk/credential-provider-node@3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)':
     dependencies:
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/credential-provider-env': 3.620.1
-      '@aws-sdk/credential-provider-http': 3.635.0
-      '@aws-sdk/credential-provider-process': 3.620.1
-      '@aws-sdk/credential-provider-sso': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/credential-provider-imds': 3.2.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-
-  '@aws-sdk/credential-provider-ini@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)':
-    dependencies:
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/credential-provider-env': 3.654.0
-      '@aws-sdk/credential-provider-http': 3.654.0
-      '@aws-sdk/credential-provider-process': 3.654.0
-      '@aws-sdk/credential-provider-sso': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))
-      '@aws-sdk/credential-provider-web-identity': 3.654.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.654.0
-      '@smithy/credential-provider-imds': 3.2.3
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-    optional: true
-
-  '@aws-sdk/credential-provider-ini@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)':
-    dependencies:
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/credential-provider-env': 3.654.0
-      '@aws-sdk/credential-provider-http': 3.654.0
-      '@aws-sdk/credential-provider-process': 3.654.0
-      '@aws-sdk/credential-provider-sso': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/credential-provider-web-identity': 3.654.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.654.0
-      '@smithy/credential-provider-imds': 3.2.3
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-
-  '@aws-sdk/credential-provider-ini@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.654.0)':
-    dependencies:
-      '@aws-sdk/client-sts': 3.654.0
-      '@aws-sdk/credential-provider-env': 3.654.0
-      '@aws-sdk/credential-provider-http': 3.654.0
-      '@aws-sdk/credential-provider-process': 3.654.0
-      '@aws-sdk/credential-provider-sso': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/credential-provider-web-identity': 3.654.0(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/types': 3.654.0
-      '@smithy/credential-provider-imds': 3.2.3
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-
-  '@aws-sdk/credential-provider-node@3.478.0':
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.468.0
-      '@aws-sdk/credential-provider-ini': 3.478.0
-      '@aws-sdk/credential-provider-process': 3.468.0
-      '@aws-sdk/credential-provider-sso': 3.478.0
-      '@aws-sdk/credential-provider-web-identity': 3.468.0
-      '@aws-sdk/types': 3.468.0
-      '@smithy/credential-provider-imds': 2.3.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/shared-ini-file-loader': 2.4.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/credential-provider-node@3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)':
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.620.1
-      '@aws-sdk/credential-provider-http': 3.635.0
-      '@aws-sdk/credential-provider-ini': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/credential-provider-process': 3.620.1
-      '@aws-sdk/credential-provider-sso': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))
-      '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/credential-provider-imds': 3.2.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
+      '@aws-sdk/credential-provider-env': 3.664.0
+      '@aws-sdk/credential-provider-http': 3.666.0
+      '@aws-sdk/credential-provider-ini': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/credential-provider-process': 3.664.0
+      '@aws-sdk/credential-provider-sso': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))
+      '@aws-sdk/credential-provider-web-identity': 3.664.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/types': 3.664.0
+      '@smithy/credential-provider-imds': 3.2.4
+      '@smithy/property-provider': 3.1.7
+      '@smithy/shared-ini-file-loader': 3.1.8
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@aws-sdk/credential-provider-node@3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)':
+  '@aws-sdk/credential-provider-process@3.664.0':
     dependencies:
-      '@aws-sdk/credential-provider-env': 3.620.1
-      '@aws-sdk/credential-provider-http': 3.635.0
-      '@aws-sdk/credential-provider-ini': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/credential-provider-process': 3.620.1
-      '@aws-sdk/credential-provider-sso': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/credential-provider-imds': 3.2.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - '@aws-sdk/client-sts'
-      - aws-crt
-
-  '@aws-sdk/credential-provider-node@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)':
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.654.0
-      '@aws-sdk/credential-provider-http': 3.654.0
-      '@aws-sdk/credential-provider-ini': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/credential-provider-process': 3.654.0
-      '@aws-sdk/credential-provider-sso': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))
-      '@aws-sdk/credential-provider-web-identity': 3.654.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.654.0
-      '@smithy/credential-provider-imds': 3.2.3
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - '@aws-sdk/client-sts'
-      - aws-crt
-    optional: true
-
-  '@aws-sdk/credential-provider-node@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)':
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.654.0
-      '@aws-sdk/credential-provider-http': 3.654.0
-      '@aws-sdk/credential-provider-ini': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/credential-provider-process': 3.654.0
-      '@aws-sdk/credential-provider-sso': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/credential-provider-web-identity': 3.654.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.654.0
-      '@smithy/credential-provider-imds': 3.2.3
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - '@aws-sdk/client-sts'
-      - aws-crt
-
-  '@aws-sdk/credential-provider-node@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.654.0)':
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.654.0
-      '@aws-sdk/credential-provider-http': 3.654.0
-      '@aws-sdk/credential-provider-ini': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/credential-provider-process': 3.654.0
-      '@aws-sdk/credential-provider-sso': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/credential-provider-web-identity': 3.654.0(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/types': 3.654.0
-      '@smithy/credential-provider-imds': 3.2.3
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - '@aws-sdk/client-sts'
-      - aws-crt
-
-  '@aws-sdk/credential-provider-process@3.468.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/shared-ini-file-loader': 2.4.0
-      '@smithy/types': 2.12.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/property-provider': 3.1.7
+      '@smithy/shared-ini-file-loader': 3.1.8
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-process@3.620.1':
+  '@aws-sdk/credential-provider-sso@3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))':
     dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@aws-sdk/credential-provider-process@3.654.0':
-    dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@aws-sdk/credential-provider-sso@3.478.0':
-    dependencies:
-      '@aws-sdk/client-sso': 3.478.0
-      '@aws-sdk/token-providers': 3.478.0
-      '@aws-sdk/types': 3.468.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/shared-ini-file-loader': 2.4.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/credential-provider-sso@3.645.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))':
-    dependencies:
-      '@aws-sdk/client-sso': 3.645.0
-      '@aws-sdk/token-providers': 3.614.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))
-      '@aws-sdk/types': 3.609.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
+      '@aws-sdk/client-sso': 3.666.0
+      '@aws-sdk/token-providers': 3.664.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))
+      '@aws-sdk/types': 3.664.0
+      '@smithy/property-provider': 3.1.7
+      '@smithy/shared-ini-file-loader': 3.1.8
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/credential-provider-sso@3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))':
+  '@aws-sdk/credential-provider-web-identity@3.664.0(@aws-sdk/client-sts@3.666.0)':
     dependencies:
-      '@aws-sdk/client-sso': 3.645.0
-      '@aws-sdk/token-providers': 3.614.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/types': 3.609.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/property-provider': 3.1.7
+      '@smithy/types': 3.5.0
+      tslib: 2.6.2
+
+  '@aws-sdk/credential-providers@3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))':
+    dependencies:
+      '@aws-sdk/client-cognito-identity': 3.666.0
+      '@aws-sdk/client-sso': 3.666.0
+      '@aws-sdk/client-sts': 3.666.0
+      '@aws-sdk/credential-provider-cognito-identity': 3.666.0
+      '@aws-sdk/credential-provider-env': 3.664.0
+      '@aws-sdk/credential-provider-http': 3.666.0
+      '@aws-sdk/credential-provider-ini': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/credential-provider-process': 3.664.0
+      '@aws-sdk/credential-provider-sso': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))
+      '@aws-sdk/credential-provider-web-identity': 3.664.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/types': 3.664.0
+      '@smithy/credential-provider-imds': 3.2.4
+      '@smithy/property-provider': 3.1.7
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
-  '@aws-sdk/credential-provider-sso@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))':
+  '@aws-sdk/middleware-bucket-endpoint@3.664.0':
     dependencies:
-      '@aws-sdk/client-sso': 3.654.0
-      '@aws-sdk/token-providers': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))
-      '@aws-sdk/types': 3.654.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-    optional: true
-
-  '@aws-sdk/credential-provider-sso@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))':
-    dependencies:
-      '@aws-sdk/client-sso': 3.654.0
-      '@aws-sdk/token-providers': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/types': 3.654.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-
-  '@aws-sdk/credential-provider-web-identity@3.468.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/types': 2.12.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-arn-parser': 3.568.0
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
+      '@smithy/util-config-provider': 3.0.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-web-identity@3.621.0(@aws-sdk/client-sts@3.645.0)':
+  '@aws-sdk/middleware-expect-continue@3.664.0':
     dependencies:
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/types': 3.609.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/types': 3.3.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-web-identity@3.654.0(@aws-sdk/client-sts@3.645.0)':
+  '@aws-sdk/middleware-flexible-checksums@3.666.0':
     dependencies:
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/types': 3.654.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/types': 3.4.2
+      '@aws-crypto/crc32': 5.2.0
+      '@aws-crypto/crc32c': 5.2.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/is-array-buffer': 3.0.0
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-provider-web-identity@3.654.0(@aws-sdk/client-sts@3.654.0)':
+  '@aws-sdk/middleware-host-header@3.664.0':
     dependencies:
-      '@aws-sdk/client-sts': 3.654.0
-      '@aws-sdk/types': 3.654.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/types': 3.4.2
+      '@aws-sdk/types': 3.664.0
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/credential-providers@3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))':
+  '@aws-sdk/middleware-location-constraint@3.664.0':
     dependencies:
-      '@aws-sdk/client-cognito-identity': 3.645.0
-      '@aws-sdk/client-sso': 3.645.0
-      '@aws-sdk/client-sts': 3.645.0
-      '@aws-sdk/credential-provider-cognito-identity': 3.645.0
-      '@aws-sdk/credential-provider-env': 3.620.1
-      '@aws-sdk/credential-provider-http': 3.635.0
-      '@aws-sdk/credential-provider-ini': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/credential-provider-process': 3.620.1
-      '@aws-sdk/credential-provider-sso': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
-      '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/credential-provider-imds': 3.2.3
-      '@smithy/property-provider': 3.1.6
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-
-  '@aws-sdk/middleware-bucket-endpoint@3.470.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@aws-sdk/util-arn-parser': 3.465.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/types': 2.12.0
-      '@smithy/util-config-provider': 2.3.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-expect-continue@3.468.0':
+  '@aws-sdk/middleware-logger@3.664.0':
     dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/types': 2.12.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-flexible-checksums@3.468.0':
+  '@aws-sdk/middleware-recursion-detection@3.664.0':
     dependencies:
-      '@aws-crypto/crc32': 3.0.0
-      '@aws-crypto/crc32c': 3.0.0
-      '@aws-sdk/types': 3.468.0
-      '@smithy/is-array-buffer': 2.2.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/types': 2.12.0
-      '@smithy/util-utf8': 2.3.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-host-header@3.468.0':
+  '@aws-sdk/middleware-sdk-s3@3.666.0':
     dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/types': 2.12.0
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-arn-parser': 3.568.0
+      '@smithy/core': 2.4.8
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/signature-v4': 4.2.0
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/util-config-provider': 3.0.0
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-stream': 3.1.9
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-host-header@3.620.0':
+  '@aws-sdk/middleware-ssec@3.664.0':
     dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/types': 3.3.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/middleware-host-header@3.654.0':
+  '@aws-sdk/middleware-user-agent@3.666.0':
     dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-location-constraint@3.468.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-logger@3.468.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-logger@3.609.0':
-    dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-logger@3.654.0':
-    dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-recursion-detection@3.468.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-recursion-detection@3.620.0':
-    dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-recursion-detection@3.654.0':
-    dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-sdk-s3@3.474.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@aws-sdk/util-arn-parser': 3.465.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/signature-v4': 2.2.1
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      '@smithy/util-config-provider': 2.3.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-signing@3.468.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/signature-v4': 2.2.1
-      '@smithy/types': 2.12.0
-      '@smithy/util-middleware': 2.2.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-ssec@3.468.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-user-agent@3.478.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@aws-sdk/util-endpoints': 3.478.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-user-agent@3.645.0':
-    dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-endpoints': 3.645.0
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@aws-sdk/middleware-user-agent@3.654.0':
-    dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@aws-sdk/util-endpoints': 3.654.0
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/types': 3.4.2
+      '@aws-sdk/core': 3.666.0
+      '@aws-sdk/types': 3.664.0
+      '@aws-sdk/util-endpoints': 3.664.0
+      '@smithy/core': 2.4.8
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@aws-sdk/node-http-handler@3.374.0':
@@ -14368,39 +13253,22 @@ snapshots:
       '@smithy/protocol-http': 1.2.0
       tslib: 2.6.2
 
-  '@aws-sdk/region-config-resolver@3.470.0':
+  '@aws-sdk/region-config-resolver@3.664.0':
     dependencies:
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/types': 2.12.0
-      '@smithy/util-config-provider': 2.3.0
-      '@smithy/util-middleware': 2.2.0
-      tslib: 2.6.2
-
-  '@aws-sdk/region-config-resolver@3.614.0':
-    dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/types': 3.3.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/types': 3.5.0
       '@smithy/util-config-provider': 3.0.0
-      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-middleware': 3.0.7
       tslib: 2.6.2
 
-  '@aws-sdk/region-config-resolver@3.654.0':
+  '@aws-sdk/signature-v4-multi-region@3.666.0':
     dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/types': 3.4.2
-      '@smithy/util-config-provider': 3.0.0
-      '@smithy/util-middleware': 3.0.6
-      tslib: 2.6.2
-
-  '@aws-sdk/signature-v4-multi-region@3.474.0':
-    dependencies:
-      '@aws-sdk/middleware-sdk-s3': 3.474.0
-      '@aws-sdk/types': 3.468.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/signature-v4': 2.2.1
-      '@smithy/types': 2.12.0
+      '@aws-sdk/middleware-sdk-s3': 3.666.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/signature-v4': 4.2.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@aws-sdk/signature-v4@3.374.0':
@@ -14408,177 +13276,57 @@ snapshots:
       '@smithy/signature-v4': 1.1.0
       tslib: 2.6.2
 
-  '@aws-sdk/token-providers@3.478.0':
+  '@aws-sdk/token-providers@3.664.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))':
     dependencies:
-      '@aws-crypto/sha256-browser': 3.0.0
-      '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/middleware-host-header': 3.468.0
-      '@aws-sdk/middleware-logger': 3.468.0
-      '@aws-sdk/middleware-recursion-detection': 3.468.0
-      '@aws-sdk/middleware-user-agent': 3.478.0
-      '@aws-sdk/region-config-resolver': 3.470.0
-      '@aws-sdk/types': 3.468.0
-      '@aws-sdk/util-endpoints': 3.478.0
-      '@aws-sdk/util-user-agent-browser': 3.468.0
-      '@aws-sdk/util-user-agent-node': 3.470.0
-      '@smithy/config-resolver': 2.2.0
-      '@smithy/fetch-http-handler': 2.5.0
-      '@smithy/hash-node': 2.2.0
-      '@smithy/invalid-dependency': 2.2.0
-      '@smithy/middleware-content-length': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
-      '@smithy/middleware-retry': 2.3.1
-      '@smithy/middleware-serde': 2.3.0
-      '@smithy/middleware-stack': 2.2.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/shared-ini-file-loader': 2.4.0
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      '@smithy/url-parser': 2.2.0
-      '@smithy/util-base64': 2.3.0
-      '@smithy/util-body-length-browser': 2.2.0
-      '@smithy/util-body-length-node': 2.3.0
-      '@smithy/util-defaults-mode-browser': 2.2.1
-      '@smithy/util-defaults-mode-node': 2.3.1
-      '@smithy/util-endpoints': 1.2.0
-      '@smithy/util-retry': 2.2.0
-      '@smithy/util-utf8': 2.3.0
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-
-  '@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0))':
-    dependencies:
-      '@aws-sdk/client-sso-oidc': 3.645.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
+      '@aws-sdk/client-sso-oidc': 3.666.0(@aws-sdk/client-sts@3.666.0)
+      '@aws-sdk/types': 3.664.0
+      '@smithy/property-provider': 3.1.7
+      '@smithy/shared-ini-file-loader': 3.1.8
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))':
+  '@aws-sdk/types@3.664.0':
     dependencies:
-      '@aws-sdk/client-sso-oidc': 3.654.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@aws-sdk/token-providers@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))':
-    dependencies:
-      '@aws-sdk/client-sso-oidc': 3.654.0(@aws-sdk/client-sts@3.645.0)
-      '@aws-sdk/types': 3.654.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-    optional: true
-
-  '@aws-sdk/token-providers@3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))':
-    dependencies:
-      '@aws-sdk/client-sso-oidc': 3.654.0(@aws-sdk/client-sts@3.654.0)
-      '@aws-sdk/types': 3.654.0
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@aws-sdk/types@3.468.0':
-    dependencies:
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@aws-sdk/types@3.609.0':
-    dependencies:
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@aws-sdk/types@3.654.0':
-    dependencies:
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@aws-sdk/util-arn-parser@3.465.0':
+  '@aws-sdk/util-arn-parser@3.568.0':
     dependencies:
       tslib: 2.6.2
 
-  '@aws-sdk/util-endpoints@3.478.0':
+  '@aws-sdk/util-endpoints@3.664.0':
     dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/util-endpoints': 1.2.0
-      tslib: 2.6.2
-
-  '@aws-sdk/util-endpoints@3.645.0':
-    dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/types': 3.3.0
-      '@smithy/util-endpoints': 2.0.5
-      tslib: 2.6.2
-
-  '@aws-sdk/util-endpoints@3.654.0':
-    dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/types': 3.4.2
-      '@smithy/util-endpoints': 2.1.2
+      '@aws-sdk/types': 3.664.0
+      '@smithy/types': 3.5.0
+      '@smithy/util-endpoints': 2.1.3
       tslib: 2.6.2
 
   '@aws-sdk/util-locate-window@3.310.0':
     dependencies:
       tslib: 2.6.2
 
-  '@aws-sdk/util-user-agent-browser@3.468.0':
+  '@aws-sdk/util-user-agent-browser@3.664.0':
     dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/types': 2.12.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/types': 3.5.0
       bowser: 2.11.0
       tslib: 2.6.2
 
-  '@aws-sdk/util-user-agent-browser@3.609.0':
+  '@aws-sdk/util-user-agent-node@3.666.0':
     dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/types': 3.3.0
-      bowser: 2.11.0
-      tslib: 2.6.2
-
-  '@aws-sdk/util-user-agent-browser@3.654.0':
-    dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/types': 3.4.2
-      bowser: 2.11.0
-      tslib: 2.6.2
-
-  '@aws-sdk/util-user-agent-node@3.470.0':
-    dependencies:
-      '@aws-sdk/types': 3.468.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@aws-sdk/util-user-agent-node@3.614.0':
-    dependencies:
-      '@aws-sdk/types': 3.609.0
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@aws-sdk/util-user-agent-node@3.654.0':
-    dependencies:
-      '@aws-sdk/types': 3.654.0
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/types': 3.4.2
+      '@aws-sdk/middleware-user-agent': 3.666.0
+      '@aws-sdk/types': 3.664.0
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@aws-sdk/util-utf8-browser@3.259.0':
     dependencies:
       tslib: 2.6.2
 
-  '@aws-sdk/xml-builder@3.472.0':
+  '@aws-sdk/xml-builder@3.662.0':
     dependencies:
-      '@smithy/types': 2.12.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@azure/abort-controller@1.1.0':
@@ -14863,14 +13611,10 @@ snapshots:
     dependencies:
       '@babel/types': 7.25.6
 
-  '@babel/helper-string-parser@7.24.6': {}
-
   '@babel/helper-string-parser@7.24.8': {}
 
   '@babel/helper-validator-identifier@7.22.20': {}
 
-  '@babel/helper-validator-identifier@7.24.6': {}
-
   '@babel/helper-validator-identifier@7.24.7': {}
 
   '@babel/helper-validator-option@7.23.5': {}
@@ -14885,15 +13629,11 @@ snapshots:
 
   '@babel/highlight@7.24.6':
     dependencies:
-      '@babel/helper-validator-identifier': 7.24.6
+      '@babel/helper-validator-identifier': 7.24.7
       chalk: 2.4.2
       js-tokens: 4.0.0
       picocolors: 1.0.1
 
-  '@babel/parser@7.24.6':
-    dependencies:
-      '@babel/types': 7.24.6
-
   '@babel/parser@7.25.6':
     dependencies:
       '@babel/types': 7.25.6
@@ -14993,12 +13733,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.24.6':
-    dependencies:
-      '@babel/helper-string-parser': 7.24.6
-      '@babel/helper-validator-identifier': 7.24.6
-      to-fast-properties: 2.0.0
-
   '@babel/types@7.25.6':
     dependencies:
       '@babel/helper-string-parser': 7.24.8
@@ -15042,6 +13776,17 @@ snapshots:
   '@biomejs/cli-win32-x64@1.9.0':
     optional: true
 
+  '@cfaester/enzyme-adapter-react-18@0.8.0(enzyme@3.11.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      enzyme: 3.11.0
+      enzyme-shallow-equal: 1.0.7
+      function.prototype.name: 1.1.6
+      has: 1.0.4
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-is: 18.2.0
+      react-shallow-renderer: 16.15.0(react@18.2.0)
+
   '@chromatic-com/storybook@2.0.2(react@18.2.0)':
     dependencies:
       chromatic: 11.10.2
@@ -15150,7 +13895,10 @@ snapshots:
       style-mod: 4.1.0
       w3c-keyname: 2.2.6
 
-  '@colors/colors@1.5.0': {}
+  '@colors/colors@1.5.0':
+    optional: true
+
+  '@colors/colors@1.6.0': {}
 
   '@common.js/is-network-error@1.0.1': {}
 
@@ -15207,9 +13955,9 @@ snapshots:
       enabled: 2.0.0
       kuler: 2.0.0
 
-  '@element-plus/icons-vue@2.3.1(vue@3.4.21(typescript@5.6.2))':
+  '@element-plus/icons-vue@2.3.1(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
   '@emotion/is-prop-valid@1.2.1':
     dependencies:
@@ -15219,73 +13967,76 @@ snapshots:
 
   '@emotion/unitless@0.8.0': {}
 
-  '@esbuild/aix-ppc64@0.20.2':
+  '@esbuild/aix-ppc64@0.24.0':
     optional: true
 
-  '@esbuild/android-arm64@0.20.2':
+  '@esbuild/android-arm64@0.24.0':
     optional: true
 
-  '@esbuild/android-arm@0.20.2':
+  '@esbuild/android-arm@0.24.0':
     optional: true
 
-  '@esbuild/android-x64@0.20.2':
+  '@esbuild/android-x64@0.24.0':
     optional: true
 
-  '@esbuild/darwin-arm64@0.20.2':
+  '@esbuild/darwin-arm64@0.24.0':
     optional: true
 
-  '@esbuild/darwin-x64@0.20.2':
+  '@esbuild/darwin-x64@0.24.0':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.20.2':
+  '@esbuild/freebsd-arm64@0.24.0':
     optional: true
 
-  '@esbuild/freebsd-x64@0.20.2':
+  '@esbuild/freebsd-x64@0.24.0':
     optional: true
 
-  '@esbuild/linux-arm64@0.20.2':
+  '@esbuild/linux-arm64@0.24.0':
     optional: true
 
-  '@esbuild/linux-arm@0.20.2':
+  '@esbuild/linux-arm@0.24.0':
     optional: true
 
-  '@esbuild/linux-ia32@0.20.2':
+  '@esbuild/linux-ia32@0.24.0':
     optional: true
 
-  '@esbuild/linux-loong64@0.20.2':
+  '@esbuild/linux-loong64@0.24.0':
     optional: true
 
-  '@esbuild/linux-mips64el@0.20.2':
+  '@esbuild/linux-mips64el@0.24.0':
     optional: true
 
-  '@esbuild/linux-ppc64@0.20.2':
+  '@esbuild/linux-ppc64@0.24.0':
     optional: true
 
-  '@esbuild/linux-riscv64@0.20.2':
+  '@esbuild/linux-riscv64@0.24.0':
     optional: true
 
-  '@esbuild/linux-s390x@0.20.2':
+  '@esbuild/linux-s390x@0.24.0':
     optional: true
 
-  '@esbuild/linux-x64@0.20.2':
+  '@esbuild/linux-x64@0.24.0':
     optional: true
 
-  '@esbuild/netbsd-x64@0.20.2':
+  '@esbuild/netbsd-x64@0.24.0':
     optional: true
 
-  '@esbuild/openbsd-x64@0.20.2':
+  '@esbuild/openbsd-arm64@0.24.0':
     optional: true
 
-  '@esbuild/sunos-x64@0.20.2':
+  '@esbuild/openbsd-x64@0.24.0':
     optional: true
 
-  '@esbuild/win32-arm64@0.20.2':
+  '@esbuild/sunos-x64@0.24.0':
     optional: true
 
-  '@esbuild/win32-ia32@0.20.2':
+  '@esbuild/win32-arm64@0.24.0':
     optional: true
 
-  '@esbuild/win32-x64@0.20.2':
+  '@esbuild/win32-ia32@0.24.0':
+    optional: true
+
+  '@esbuild/win32-x64@0.24.0':
     optional: true
 
   '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)':
@@ -15298,7 +14049,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       espree: 9.6.1
       globals: 13.20.0
       ignore: 5.2.4
@@ -15345,15 +14096,15 @@ snapshots:
     dependencies:
       '@fortawesome/fontawesome-common-types': 0.2.36
 
-  '@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.4.21(typescript@5.6.2))':
+  '@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.6.2))':
     dependencies:
       '@fortawesome/fontawesome-svg-core': 1.2.36
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
   '@gar/promisify@1.1.3':
     optional: true
 
-  '@getzep/zep-cloud@1.0.11(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(jteet444uhz3pk3ib4eb2yc7pm))':
+  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(u4cmnaniapk3e37ytin75vjstm))':
     dependencies:
       form-data: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
@@ -15362,7 +14113,7 @@ snapshots:
       zod: 3.23.8
     optionalDependencies:
       '@langchain/core': 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      langchain: 0.3.2(jteet444uhz3pk3ib4eb2yc7pm)
+      langchain: 0.3.2(u4cmnaniapk3e37ytin75vjstm)
     transitivePeerDependencies:
       - encoding
 
@@ -15454,7 +14205,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -15484,7 +14235,7 @@ snapshots:
       '@antfu/install-pkg': 0.1.1
       '@antfu/utils': 0.7.10
       '@iconify/types': 2.0.0
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       kolorist: 1.8.0
       local-pkg: 0.5.0
       mlly: 1.7.1
@@ -15572,7 +14323,7 @@ snapshots:
       jest-util: 29.6.2
       jest-validate: 29.6.2
       jest-watcher: 29.6.2
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       pretty-format: 29.7.0
       slash: 3.0.0
       strip-ansi: 6.0.1
@@ -15635,7 +14386,7 @@ snapshots:
       istanbul-lib-instrument: 5.2.1
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.6
+      istanbul-reports: 3.1.7
       jest-message-util: 29.6.2
       jest-util: 29.6.2
       jest-worker: 29.6.2
@@ -15691,7 +14442,7 @@ snapshots:
       jest-haste-map: 29.6.2
       jest-regex-util: 29.4.3
       jest-util: 29.6.2
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       pirates: 4.0.6
       slash: 3.0.0
       write-file-atomic: 4.0.2
@@ -15710,14 +14461,17 @@ snapshots:
   '@jridgewell/gen-mapping@0.3.5':
     dependencies:
       '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/sourcemap-codec': 1.5.0
       '@jridgewell/trace-mapping': 0.3.25
 
   '@jridgewell/resolve-uri@3.1.0': {}
 
+  '@jridgewell/resolve-uri@3.1.2':
+    optional: true
+
   '@jridgewell/set-array@1.2.1': {}
 
-  '@jridgewell/source-map@0.3.2':
+  '@jridgewell/source-map@0.3.6':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
@@ -15730,11 +14484,11 @@ snapshots:
   '@jridgewell/trace-mapping@0.3.25':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/sourcemap-codec': 1.5.0
 
   '@jridgewell/trace-mapping@0.3.9':
     dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
+      '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
     optional: true
 
@@ -15778,7 +14532,7 @@ snapshots:
 
   '@kwsites/file-exists@1.1.1':
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -15795,12 +14549,12 @@ snapshots:
       - encoding
       - supports-color
 
-  '@langchain/aws@0.1.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/aws@0.1.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))':
     dependencies:
-      '@aws-sdk/client-bedrock-agent-runtime': 3.654.0
-      '@aws-sdk/client-bedrock-runtime': 3.645.0
-      '@aws-sdk/client-kendra': 3.654.0
-      '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)
+      '@aws-sdk/client-bedrock-agent-runtime': 3.666.0
+      '@aws-sdk/client-bedrock-runtime': 3.666.0
+      '@aws-sdk/client-kendra': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
       '@langchain/core': 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
@@ -15809,10 +14563,10 @@ snapshots:
       - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@langchain/cohere@0.3.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/cohere@0.3.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
     dependencies:
       '@langchain/core': 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      cohere-ai: 7.13.2(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(encoding@0.1.13)
+      cohere-ai: 7.13.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
       uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
@@ -15821,7 +14575,7 @@ snapshots:
       - aws-crt
       - encoding
 
-  '@langchain/community@0.3.2(civqmlpli3jn6p47akgofyjajm)':
+  '@langchain/community@0.3.2(ybvsmgvmojutmcl4aem5hlk5te)':
     dependencies:
       '@langchain/core': 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
       '@langchain/openai': 0.3.0(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
@@ -15829,20 +14583,20 @@ snapshots:
       expr-eval: 2.0.2
       flat: 5.0.2
       js-yaml: 4.1.0
-      langchain: 0.3.2(jteet444uhz3pk3ib4eb2yc7pm)
+      langchain: 0.3.2(u4cmnaniapk3e37ytin75vjstm)
       langsmith: 0.1.59(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
       uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
     optionalDependencies:
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-bedrock-agent-runtime': 3.654.0
-      '@aws-sdk/client-bedrock-runtime': 3.645.0
-      '@aws-sdk/client-kendra': 3.654.0
-      '@aws-sdk/client-s3': 3.478.0
-      '@aws-sdk/credential-provider-node': 3.654.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.645.0))(@aws-sdk/client-sts@3.645.0)
+      '@aws-sdk/client-bedrock-agent-runtime': 3.666.0
+      '@aws-sdk/client-bedrock-runtime': 3.666.0
+      '@aws-sdk/client-kendra': 3.666.0
+      '@aws-sdk/client-s3': 3.666.0
+      '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
       '@azure/storage-blob': 12.18.0(encoding@0.1.13)
-      '@getzep/zep-cloud': 1.0.11(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(jteet444uhz3pk3ib4eb2yc7pm))
+      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(u4cmnaniapk3e37ytin75vjstm))
       '@getzep/zep-js': 0.9.0
       '@google-ai/generativelanguage': 2.6.0(encoding@0.1.13)
       '@google-cloud/storage': 7.12.1(encoding@0.1.13)
@@ -15855,9 +14609,9 @@ snapshots:
       '@smithy/signature-v4': 2.2.1
       '@smithy/util-utf8': 2.3.0
       '@supabase/supabase-js': 2.45.4
-      '@xata.io/client': 0.30.0(typescript@5.6.2)
-      cheerio: 1.0.0-rc.12
-      cohere-ai: 7.13.2(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(encoding@0.1.13)
+      '@xata.io/client': 0.28.4(typescript@5.6.2)
+      cheerio: 1.0.0
+      cohere-ai: 7.13.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
       crypto-js: 4.2.0
       d3-dsv: 2.0.0
       epub2: 3.0.2(ts-toolbelt@9.6.0)
@@ -15906,6 +14660,38 @@ snapshots:
     transitivePeerDependencies:
       - openai
 
+  '@langchain/core@0.3.3(openai@4.63.0(zod@3.23.8))':
+    dependencies:
+      ansi-styles: 5.2.0
+      camelcase: 6.3.0
+      decamelize: 1.2.0
+      js-tiktoken: 1.0.12
+      langsmith: 0.1.59(openai@4.63.0(zod@3.23.8))
+      mustache: 4.2.0
+      p-queue: 6.6.2
+      p-retry: 4.6.2
+      uuid: 10.0.0
+      zod: 3.23.8
+      zod-to-json-schema: 3.23.3(zod@3.23.8)
+    transitivePeerDependencies:
+      - openai
+
+  '@langchain/core@0.3.3(openai@4.63.0)':
+    dependencies:
+      ansi-styles: 5.2.0
+      camelcase: 6.3.0
+      decamelize: 1.2.0
+      js-tiktoken: 1.0.12
+      langsmith: 0.1.59(openai@4.63.0)
+      mustache: 4.2.0
+      p-queue: 6.6.2
+      p-retry: 4.6.2
+      uuid: 10.0.0
+      zod: 3.23.8
+      zod-to-json-schema: 3.23.3(zod@3.23.8)
+    transitivePeerDependencies:
+      - openai
+
   '@langchain/google-common@0.1.1(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)':
     dependencies:
       '@langchain/core': 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
@@ -16053,23 +14839,23 @@ snapshots:
       '@types/react': 18.0.27
       react: 18.2.0
 
-  '@microsoft/api-extractor-model@7.28.13(@types/node@18.16.16)':
+  '@microsoft/api-extractor-model@7.29.6(@types/node@18.16.16)':
     dependencies:
-      '@microsoft/tsdoc': 0.14.2
-      '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 4.0.2(@types/node@18.16.16)
+      '@microsoft/tsdoc': 0.15.0
+      '@microsoft/tsdoc-config': 0.17.0
+      '@rushstack/node-core-library': 5.7.0(@types/node@18.16.16)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/api-extractor@7.43.0(@types/node@18.16.16)':
+  '@microsoft/api-extractor@7.47.7(@types/node@18.16.16)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.28.13(@types/node@18.16.16)
-      '@microsoft/tsdoc': 0.14.2
-      '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 4.0.2(@types/node@18.16.16)
-      '@rushstack/rig-package': 0.5.2
-      '@rushstack/terminal': 0.10.0(@types/node@18.16.16)
-      '@rushstack/ts-command-line': 4.19.1(@types/node@18.16.16)
+      '@microsoft/api-extractor-model': 7.29.6(@types/node@18.16.16)
+      '@microsoft/tsdoc': 0.15.0
+      '@microsoft/tsdoc-config': 0.17.0
+      '@rushstack/node-core-library': 5.7.0(@types/node@18.16.16)
+      '@rushstack/rig-package': 0.5.3
+      '@rushstack/terminal': 0.14.0(@types/node@18.16.16)
+      '@rushstack/ts-command-line': 4.22.6(@types/node@18.16.16)
       lodash: 4.17.21
       minimatch: 3.0.8
       resolve: 1.22.8
@@ -16079,14 +14865,14 @@ snapshots:
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/tsdoc-config@0.16.2':
+  '@microsoft/tsdoc-config@0.17.0':
     dependencies:
-      '@microsoft/tsdoc': 0.14.2
-      ajv: 6.12.6
+      '@microsoft/tsdoc': 0.15.0
+      ajv: 8.12.0
       jju: 1.4.0
-      resolve: 1.19.0
+      resolve: 1.22.8
 
-  '@microsoft/tsdoc@0.14.2': {}
+  '@microsoft/tsdoc@0.15.0': {}
 
   '@miragejs/pretender-node-polyfill@0.1.2': {}
 
@@ -16096,7 +14882,7 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@mongodb-js/saslprep@1.1.0':
+  '@mongodb-js/saslprep@1.1.9':
     dependencies:
       sparse-bitfield: 3.0.3
 
@@ -16133,7 +14919,7 @@ snapshots:
 
   '@n8n/localtunnel@3.0.0':
     dependencies:
-      axios: 1.7.3(debug@4.3.6)
+      axios: 1.7.7(debug@4.3.6)
       debug: 4.3.6(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
@@ -16151,7 +14937,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.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))':
+  '@n8n/typeorm@0.3.20-12(@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)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -16160,9 +14946,9 @@ snapshots:
       buffer: 6.0.3
       chalk: 4.1.2
       dayjs: 1.11.10
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       dotenv: 16.3.1
-      glob: 10.3.10
+      glob: 10.4.5
       mkdirp: 2.1.3
       reflect-metadata: 0.2.2
       sha.js: 2.4.11
@@ -16182,7 +14968,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@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)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))':
+  '@n8n/typeorm@0.3.20-12(@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)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -16191,9 +14977,9 @@ snapshots:
       buffer: 6.0.3
       chalk: 4.1.2
       dayjs: 1.11.10
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       dotenv: 16.3.1
-      glob: 10.3.10
+      glob: 10.4.5
       mkdirp: 2.1.3
       reflect-metadata: 0.2.2
       sha.js: 2.4.11
@@ -16218,9 +15004,7 @@ 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/ai-assistant-sdk@1.10.3': {}
 
   '@n8n_io/license-sdk@2.13.1':
     dependencies:
@@ -16317,10 +15101,10 @@ snapshots:
     dependencies:
       encoding: 0.1.13
 
-  '@pinia/testing@0.1.3(pinia@2.1.6(typescript@5.6.2)(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))':
+  '@pinia/testing@0.1.6(pinia@2.2.4(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      pinia: 2.1.6(typescript@5.6.2)(vue@3.4.21(typescript@5.6.2))
-      vue-demi: 0.14.5(vue@3.4.21(typescript@5.6.2))
+      pinia: 2.2.4(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -16412,27 +15196,30 @@ snapshots:
     dependencies:
       '@redis/client': 1.5.16
 
-  '@redocly/ajv@8.11.0':
+  '@redocly/ajv@8.11.2':
     dependencies:
       fast-deep-equal: 3.1.3
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
-      uri-js: 4.4.1
+      uri-js-replace: 1.0.1
 
-  '@redocly/cli@1.6.0(encoding@0.1.13)':
+  '@redocly/cli@1.25.5(encoding@0.1.13)(enzyme@3.11.0)':
     dependencies:
-      '@redocly/openapi-core': 1.6.0(encoding@0.1.13)
-      chokidar: 3.5.2
+      '@redocly/openapi-core': 1.25.5(encoding@0.1.13)
+      abort-controller: 3.0.0
+      chokidar: 4.0.1
       colorette: 1.4.0
       core-js: 3.35.0
+      form-data: 4.0.0
       get-port-please: 3.1.2
       glob: 7.2.3
       handlebars: 4.7.8
       mobx: 6.12.0
       node-fetch: 2.7.0(encoding@0.1.13)
+      pluralize: 8.0.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      redoc: 2.1.3(core-js@3.35.0)(encoding@0.1.13)(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(styled-components@6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0))
+      redoc: 2.1.5(core-js@3.35.0)(encoding@0.1.13)(enzyme@3.11.0)(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(styled-components@6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0))
       semver: 7.6.0
       simple-websocket: 9.1.0
       styled-components: 6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -16440,15 +15227,19 @@ snapshots:
     transitivePeerDependencies:
       - bufferutil
       - encoding
+      - enzyme
       - react-native
       - supports-color
       - utf-8-validate
 
-  '@redocly/openapi-core@1.6.0(encoding@0.1.13)':
+  '@redocly/config@0.12.1': {}
+
+  '@redocly/openapi-core@1.25.5(encoding@0.1.13)':
     dependencies:
-      '@redocly/ajv': 8.11.0
-      '@types/node': 18.16.16
+      '@redocly/ajv': 8.11.2
+      '@redocly/config': 0.12.1
       colorette: 1.4.0
+      https-proxy-agent: 7.0.5
       js-levenshtein: 1.1.6
       js-yaml: 4.1.0
       lodash.isequal: 4.5.0
@@ -16458,61 +15249,62 @@ snapshots:
       yaml-ast-parser: 0.0.43
     transitivePeerDependencies:
       - encoding
+      - supports-color
 
-  '@rollup/pluginutils@5.1.0(rollup@4.22.2)':
+  '@rollup/pluginutils@5.1.0(rollup@4.24.0)':
     dependencies:
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
-      rollup: 4.22.2
+      rollup: 4.24.0
 
-  '@rollup/rollup-android-arm-eabi@4.22.2':
+  '@rollup/rollup-android-arm-eabi@4.24.0':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.22.2':
+  '@rollup/rollup-android-arm64@4.24.0':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.22.2':
+  '@rollup/rollup-darwin-arm64@4.24.0':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.22.2':
+  '@rollup/rollup-darwin-x64@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.22.2':
+  '@rollup/rollup-linux-arm-gnueabihf@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.22.2':
+  '@rollup/rollup-linux-arm-musleabihf@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.22.2':
+  '@rollup/rollup-linux-arm64-gnu@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.22.2':
+  '@rollup/rollup-linux-arm64-musl@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.22.2':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.22.2':
+  '@rollup/rollup-linux-riscv64-gnu@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.22.2':
+  '@rollup/rollup-linux-s390x-gnu@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.22.2':
+  '@rollup/rollup-linux-x64-gnu@4.24.0':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.22.2':
+  '@rollup/rollup-linux-x64-musl@4.24.0':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.22.2':
+  '@rollup/rollup-win32-arm64-msvc@4.24.0':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.22.2':
+  '@rollup/rollup-win32-ia32-msvc@4.24.0':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.22.2':
+  '@rollup/rollup-win32-x64-msvc@4.24.0':
     optional: true
 
   '@rudderstack/rudder-sdk-node@2.0.9(tslib@2.6.2)':
@@ -16535,32 +15327,34 @@ snapshots:
       - debug
       - supports-color
 
-  '@rushstack/node-core-library@4.0.2(@types/node@18.16.16)':
+  '@rushstack/node-core-library@5.7.0(@types/node@18.16.16)':
     dependencies:
+      ajv: 8.13.0
+      ajv-draft-04: 1.0.0(ajv@8.13.0)
+      ajv-formats: 3.0.1(ajv@8.13.0)
       fs-extra: 7.0.1
       import-lazy: 4.0.0
       jju: 1.4.0
       resolve: 1.22.8
       semver: 7.6.0
-      z-schema: 5.0.5
     optionalDependencies:
       '@types/node': 18.16.16
 
-  '@rushstack/rig-package@0.5.2':
+  '@rushstack/rig-package@0.5.3':
     dependencies:
       resolve: 1.22.8
       strip-json-comments: 3.1.1
 
-  '@rushstack/terminal@0.10.0(@types/node@18.16.16)':
+  '@rushstack/terminal@0.14.0(@types/node@18.16.16)':
     dependencies:
-      '@rushstack/node-core-library': 4.0.2(@types/node@18.16.16)
+      '@rushstack/node-core-library': 5.7.0(@types/node@18.16.16)
       supports-color: 8.1.1
     optionalDependencies:
       '@types/node': 18.16.16
 
-  '@rushstack/ts-command-line@4.19.1(@types/node@18.16.16)':
+  '@rushstack/ts-command-line@4.22.6(@types/node@18.16.16)':
     dependencies:
-      '@rushstack/terminal': 0.10.0(@types/node@18.16.16)
+      '@rushstack/terminal': 0.14.0(@types/node@18.16.16)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.1
@@ -16572,31 +15366,31 @@ snapshots:
       domhandler: 5.0.3
       selderee: 0.11.0
 
-  '@sentry-internal/browser-utils@8.31.0':
+  '@sentry-internal/browser-utils@8.33.1':
     dependencies:
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry/core': 8.33.1
+      '@sentry/types': 8.33.1
+      '@sentry/utils': 8.33.1
 
-  '@sentry-internal/feedback@8.31.0':
+  '@sentry-internal/feedback@8.33.1':
     dependencies:
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry/core': 8.33.1
+      '@sentry/types': 8.33.1
+      '@sentry/utils': 8.33.1
 
-  '@sentry-internal/replay-canvas@8.31.0':
+  '@sentry-internal/replay-canvas@8.33.1':
     dependencies:
-      '@sentry-internal/replay': 8.31.0
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry-internal/replay': 8.33.1
+      '@sentry/core': 8.33.1
+      '@sentry/types': 8.33.1
+      '@sentry/utils': 8.33.1
 
-  '@sentry-internal/replay@8.31.0':
+  '@sentry-internal/replay@8.33.1':
     dependencies:
-      '@sentry-internal/browser-utils': 8.31.0
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry-internal/browser-utils': 8.33.1
+      '@sentry/core': 8.33.1
+      '@sentry/types': 8.33.1
+      '@sentry/utils': 8.33.1
 
   '@sentry-internal/tracing@7.87.0':
     dependencies:
@@ -16604,22 +15398,22 @@ snapshots:
       '@sentry/types': 7.87.0
       '@sentry/utils': 7.87.0
 
-  '@sentry/babel-plugin-component-annotate@2.22.4': {}
+  '@sentry/babel-plugin-component-annotate@2.22.5': {}
 
-  '@sentry/browser@8.31.0':
+  '@sentry/browser@8.33.1':
     dependencies:
-      '@sentry-internal/browser-utils': 8.31.0
-      '@sentry-internal/feedback': 8.31.0
-      '@sentry-internal/replay': 8.31.0
-      '@sentry-internal/replay-canvas': 8.31.0
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry-internal/browser-utils': 8.33.1
+      '@sentry-internal/feedback': 8.33.1
+      '@sentry-internal/replay': 8.33.1
+      '@sentry-internal/replay-canvas': 8.33.1
+      '@sentry/core': 8.33.1
+      '@sentry/types': 8.33.1
+      '@sentry/utils': 8.33.1
 
-  '@sentry/bundler-plugin-core@2.22.4(encoding@0.1.13)':
+  '@sentry/bundler-plugin-core@2.22.5(encoding@0.1.13)':
     dependencies:
       '@babel/core': 7.24.0
-      '@sentry/babel-plugin-component-annotate': 2.22.4
+      '@sentry/babel-plugin-component-annotate': 2.22.5
       '@sentry/cli': 2.36.2(patch_hash=saib6xuadkfhahfipsdedqib2i)(encoding@0.1.13)
       dotenv: 16.3.1
       find-up: 5.0.0
@@ -16675,10 +15469,10 @@ snapshots:
       '@sentry/types': 7.87.0
       '@sentry/utils': 7.87.0
 
-  '@sentry/core@8.31.0':
+  '@sentry/core@8.33.1':
     dependencies:
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
+      '@sentry/types': 8.33.1
+      '@sentry/utils': 8.33.1
 
   '@sentry/integrations@7.87.0':
     dependencies:
@@ -16699,31 +15493,31 @@ snapshots:
 
   '@sentry/types@7.87.0': {}
 
-  '@sentry/types@8.31.0': {}
+  '@sentry/types@8.33.1': {}
 
   '@sentry/utils@7.87.0':
     dependencies:
       '@sentry/types': 7.87.0
 
-  '@sentry/utils@8.31.0':
+  '@sentry/utils@8.33.1':
     dependencies:
-      '@sentry/types': 8.31.0
+      '@sentry/types': 8.33.1
 
-  '@sentry/vite-plugin@2.22.4(encoding@0.1.13)':
+  '@sentry/vite-plugin@2.22.5(encoding@0.1.13)':
     dependencies:
-      '@sentry/bundler-plugin-core': 2.22.4(encoding@0.1.13)
+      '@sentry/bundler-plugin-core': 2.22.5(encoding@0.1.13)
       unplugin: 1.0.1
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@sentry/vue@8.31.0(vue@3.4.21(typescript@5.6.2))':
+  '@sentry/vue@8.33.1(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@sentry/browser': 8.31.0
-      '@sentry/core': 8.31.0
-      '@sentry/types': 8.31.0
-      '@sentry/utils': 8.31.0
-      vue: 3.4.21(typescript@5.6.2)
+      '@sentry/browser': 8.33.1
+      '@sentry/core': 8.33.1
+      '@sentry/types': 8.33.1
+      '@sentry/utils': 8.33.1
+      vue: 3.5.11(typescript@5.6.2)
 
   '@sevinf/maybe@0.5.0': {}
 
@@ -16760,113 +15554,47 @@ snapshots:
       '@smithy/types': 1.2.0
       tslib: 2.6.2
 
-  '@smithy/abort-controller@2.2.0':
+  '@smithy/abort-controller@3.1.5':
     dependencies:
-      '@smithy/types': 2.12.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/abort-controller@3.1.1':
+  '@smithy/chunked-blob-reader-native@3.0.0':
     dependencies:
-      '@smithy/types': 3.3.0
+      '@smithy/util-base64': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/abort-controller@3.1.4':
-    dependencies:
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/chunked-blob-reader-native@2.0.1':
-    dependencies:
-      '@smithy/util-base64': 2.3.0
-      tslib: 2.6.2
-
-  '@smithy/chunked-blob-reader@2.0.0':
+  '@smithy/chunked-blob-reader@3.0.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/config-resolver@2.2.0':
+  '@smithy/config-resolver@3.0.9':
     dependencies:
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/types': 2.12.0
-      '@smithy/util-config-provider': 2.3.0
-      '@smithy/util-middleware': 2.2.0
-      tslib: 2.6.2
-
-  '@smithy/config-resolver@3.0.5':
-    dependencies:
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/types': 3.3.0
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/types': 3.5.0
       '@smithy/util-config-provider': 3.0.0
-      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-middleware': 3.0.7
       tslib: 2.6.2
 
-  '@smithy/config-resolver@3.0.8':
+  '@smithy/core@2.4.8':
     dependencies:
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/types': 3.4.2
-      '@smithy/util-config-provider': 3.0.0
-      '@smithy/util-middleware': 3.0.6
-      tslib: 2.6.2
-
-  '@smithy/core@1.4.2':
-    dependencies:
-      '@smithy/middleware-endpoint': 2.5.1
-      '@smithy/middleware-retry': 2.3.1
-      '@smithy/middleware-serde': 2.3.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      '@smithy/util-middleware': 2.2.0
-      tslib: 2.6.2
-
-  '@smithy/core@2.4.0':
-    dependencies:
-      '@smithy/middleware-endpoint': 3.1.0
-      '@smithy/middleware-retry': 3.0.15
-      '@smithy/middleware-serde': 3.0.3
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-retry': 3.0.23
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
       '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-middleware': 3.0.7
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/core@2.4.5':
+  '@smithy/credential-provider-imds@3.2.4':
     dependencies:
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-retry': 3.0.20
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
-
-  '@smithy/credential-provider-imds@2.3.0':
-    dependencies:
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/types': 2.12.0
-      '@smithy/url-parser': 2.2.0
-      tslib: 2.6.2
-
-  '@smithy/credential-provider-imds@3.2.0':
-    dependencies:
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/property-provider': 3.1.3
-      '@smithy/types': 3.3.0
-      '@smithy/url-parser': 3.0.3
-      tslib: 2.6.2
-
-  '@smithy/credential-provider-imds@3.2.3':
-    dependencies:
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/property-provider': 3.1.6
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/property-provider': 3.1.7
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
       tslib: 2.6.2
 
   '@smithy/eventstream-codec@1.1.0':
@@ -16882,161 +15610,69 @@ snapshots:
       '@smithy/types': 2.12.0
       '@smithy/util-hex-encoding': 2.2.0
       tslib: 2.6.2
+    optional: true
 
-  '@smithy/eventstream-codec@3.1.2':
+  '@smithy/eventstream-codec@3.1.6':
     dependencies:
       '@aws-crypto/crc32': 5.2.0
-      '@smithy/types': 3.3.0
+      '@smithy/types': 3.5.0
       '@smithy/util-hex-encoding': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-codec@3.1.5':
+  '@smithy/eventstream-serde-browser@3.0.10':
     dependencies:
-      '@aws-crypto/crc32': 5.2.0
-      '@smithy/types': 3.4.2
-      '@smithy/util-hex-encoding': 3.0.0
+      '@smithy/eventstream-serde-universal': 3.0.9
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-browser@2.2.0':
+  '@smithy/eventstream-serde-config-resolver@3.0.7':
     dependencies:
-      '@smithy/eventstream-serde-universal': 2.2.0
-      '@smithy/types': 2.12.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-browser@3.0.6':
+  '@smithy/eventstream-serde-node@3.0.9':
     dependencies:
-      '@smithy/eventstream-serde-universal': 3.0.5
-      '@smithy/types': 3.3.0
+      '@smithy/eventstream-serde-universal': 3.0.9
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-browser@3.0.9':
+  '@smithy/eventstream-serde-universal@3.0.9':
     dependencies:
-      '@smithy/eventstream-serde-universal': 3.0.8
-      '@smithy/types': 3.4.2
+      '@smithy/eventstream-codec': 3.1.6
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/eventstream-serde-config-resolver@2.2.0':
+  '@smithy/fetch-http-handler@3.2.9':
     dependencies:
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/eventstream-serde-config-resolver@3.0.3':
-    dependencies:
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/eventstream-serde-config-resolver@3.0.6':
-    dependencies:
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/eventstream-serde-node@2.2.0':
-    dependencies:
-      '@smithy/eventstream-serde-universal': 2.2.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/eventstream-serde-node@3.0.5':
-    dependencies:
-      '@smithy/eventstream-serde-universal': 3.0.5
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/eventstream-serde-node@3.0.8':
-    dependencies:
-      '@smithy/eventstream-serde-universal': 3.0.8
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/eventstream-serde-universal@2.2.0':
-    dependencies:
-      '@smithy/eventstream-codec': 2.2.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/eventstream-serde-universal@3.0.5':
-    dependencies:
-      '@smithy/eventstream-codec': 3.1.2
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/eventstream-serde-universal@3.0.8':
-    dependencies:
-      '@smithy/eventstream-codec': 3.1.5
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/fetch-http-handler@2.5.0':
-    dependencies:
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/querystring-builder': 2.2.0
-      '@smithy/types': 2.12.0
-      '@smithy/util-base64': 2.3.0
-      tslib: 2.6.2
-
-  '@smithy/fetch-http-handler@3.2.4':
-    dependencies:
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/querystring-builder': 3.0.3
-      '@smithy/types': 3.3.0
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/querystring-builder': 3.0.7
+      '@smithy/types': 3.5.0
       '@smithy/util-base64': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/fetch-http-handler@3.2.8':
+  '@smithy/hash-blob-browser@3.1.6':
     dependencies:
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/querystring-builder': 3.0.6
-      '@smithy/types': 3.4.2
-      '@smithy/util-base64': 3.0.0
+      '@smithy/chunked-blob-reader': 3.0.0
+      '@smithy/chunked-blob-reader-native': 3.0.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/hash-blob-browser@2.0.16':
+  '@smithy/hash-node@3.0.7':
     dependencies:
-      '@smithy/chunked-blob-reader': 2.0.0
-      '@smithy/chunked-blob-reader-native': 2.0.1
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/hash-node@2.2.0':
-    dependencies:
-      '@smithy/types': 2.12.0
-      '@smithy/util-buffer-from': 2.2.0
-      '@smithy/util-utf8': 2.3.0
-      tslib: 2.6.2
-
-  '@smithy/hash-node@3.0.3':
-    dependencies:
-      '@smithy/types': 3.3.0
+      '@smithy/types': 3.5.0
       '@smithy/util-buffer-from': 3.0.0
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/hash-node@3.0.6':
+  '@smithy/hash-stream-node@3.1.6':
     dependencies:
-      '@smithy/types': 3.4.2
-      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/types': 3.5.0
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/hash-stream-node@2.0.17':
+  '@smithy/invalid-dependency@3.0.7':
     dependencies:
-      '@smithy/types': 2.12.0
-      '@smithy/util-utf8': 2.3.0
-      tslib: 2.6.2
-
-  '@smithy/invalid-dependency@2.2.0':
-    dependencies:
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/invalid-dependency@3.0.3':
-    dependencies:
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/invalid-dependency@3.0.6':
-    dependencies:
-      '@smithy/types': 3.4.2
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@smithy/is-array-buffer@1.1.0':
@@ -17051,145 +15687,55 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/md5-js@2.0.17':
+  '@smithy/md5-js@3.0.7':
     dependencies:
-      '@smithy/types': 2.12.0
-      '@smithy/util-utf8': 2.3.0
+      '@smithy/types': 3.5.0
+      '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/middleware-content-length@2.2.0':
+  '@smithy/middleware-content-length@3.0.9':
     dependencies:
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/types': 2.12.0
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/middleware-content-length@3.0.5':
+  '@smithy/middleware-endpoint@3.1.4':
     dependencies:
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/types': 3.3.0
+      '@smithy/middleware-serde': 3.0.7
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/shared-ini-file-loader': 3.1.8
+      '@smithy/types': 3.5.0
+      '@smithy/url-parser': 3.0.7
+      '@smithy/util-middleware': 3.0.7
       tslib: 2.6.2
 
-  '@smithy/middleware-content-length@3.0.8':
+  '@smithy/middleware-retry@3.0.23':
     dependencies:
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/middleware-endpoint@2.5.1':
-    dependencies:
-      '@smithy/middleware-serde': 2.3.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/shared-ini-file-loader': 2.4.0
-      '@smithy/types': 2.12.0
-      '@smithy/url-parser': 2.2.0
-      '@smithy/util-middleware': 2.2.0
-      tslib: 2.6.2
-
-  '@smithy/middleware-endpoint@3.1.0':
-    dependencies:
-      '@smithy/middleware-serde': 3.0.3
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
-      '@smithy/url-parser': 3.0.3
-      '@smithy/util-middleware': 3.0.3
-      tslib: 2.6.2
-
-  '@smithy/middleware-endpoint@3.1.3':
-    dependencies:
-      '@smithy/middleware-serde': 3.0.6
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
-      '@smithy/url-parser': 3.0.6
-      '@smithy/util-middleware': 3.0.6
-      tslib: 2.6.2
-
-  '@smithy/middleware-retry@2.3.1':
-    dependencies:
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/service-error-classification': 2.1.5
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      '@smithy/util-middleware': 2.2.0
-      '@smithy/util-retry': 2.2.0
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/service-error-classification': 3.0.7
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
+      '@smithy/util-middleware': 3.0.7
+      '@smithy/util-retry': 3.0.7
       tslib: 2.6.2
       uuid: 9.0.1
 
-  '@smithy/middleware-retry@3.0.15':
+  '@smithy/middleware-serde@3.0.7':
     dependencies:
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/service-error-classification': 3.0.3
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      '@smithy/util-middleware': 3.0.3
-      '@smithy/util-retry': 3.0.3
-      tslib: 2.6.2
-      uuid: 9.0.1
-
-  '@smithy/middleware-retry@3.0.20':
-    dependencies:
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/service-error-classification': 3.0.6
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-retry': 3.0.6
-      tslib: 2.6.2
-      uuid: 9.0.1
-
-  '@smithy/middleware-serde@2.3.0':
-    dependencies:
-      '@smithy/types': 2.12.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/middleware-serde@3.0.3':
+  '@smithy/middleware-stack@3.0.7':
     dependencies:
-      '@smithy/types': 3.3.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/middleware-serde@3.0.6':
+  '@smithy/node-config-provider@3.1.8':
     dependencies:
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/middleware-stack@2.2.0':
-    dependencies:
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/middleware-stack@3.0.3':
-    dependencies:
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/middleware-stack@3.0.6':
-    dependencies:
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/node-config-provider@2.3.0':
-    dependencies:
-      '@smithy/property-provider': 2.2.0
-      '@smithy/shared-ini-file-loader': 2.4.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/node-config-provider@3.1.4':
-    dependencies:
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/node-config-provider@3.1.7':
-    dependencies:
-      '@smithy/property-provider': 3.1.6
-      '@smithy/shared-ini-file-loader': 3.1.7
-      '@smithy/types': 3.4.2
+      '@smithy/property-provider': 3.1.7
+      '@smithy/shared-ini-file-loader': 3.1.8
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@smithy/node-http-handler@1.1.0':
@@ -17200,43 +15746,17 @@ snapshots:
       '@smithy/types': 1.2.0
       tslib: 2.6.2
 
-  '@smithy/node-http-handler@2.5.0':
+  '@smithy/node-http-handler@3.2.4':
     dependencies:
-      '@smithy/abort-controller': 2.2.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/querystring-builder': 2.2.0
-      '@smithy/types': 2.12.0
+      '@smithy/abort-controller': 3.1.5
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/querystring-builder': 3.0.7
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/node-http-handler@3.1.4':
+  '@smithy/property-provider@3.1.7':
     dependencies:
-      '@smithy/abort-controller': 3.1.1
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/querystring-builder': 3.0.3
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/node-http-handler@3.2.3':
-    dependencies:
-      '@smithy/abort-controller': 3.1.4
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/querystring-builder': 3.0.6
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/property-provider@2.2.0':
-    dependencies:
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/property-provider@3.1.3':
-    dependencies:
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/property-provider@3.1.6':
-    dependencies:
-      '@smithy/types': 3.4.2
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@smithy/protocol-http@1.2.0':
@@ -17248,15 +15768,11 @@ snapshots:
     dependencies:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
+    optional: true
 
-  '@smithy/protocol-http@4.1.0':
+  '@smithy/protocol-http@4.1.4':
     dependencies:
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/protocol-http@4.1.3':
-    dependencies:
-      '@smithy/types': 3.4.2
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@smithy/querystring-builder@1.1.0':
@@ -17265,64 +15781,24 @@ snapshots:
       '@smithy/util-uri-escape': 1.1.0
       tslib: 2.6.2
 
-  '@smithy/querystring-builder@2.2.0':
+  '@smithy/querystring-builder@3.0.7':
     dependencies:
-      '@smithy/types': 2.12.0
-      '@smithy/util-uri-escape': 2.2.0
-      tslib: 2.6.2
-
-  '@smithy/querystring-builder@3.0.3':
-    dependencies:
-      '@smithy/types': 3.3.0
+      '@smithy/types': 3.5.0
       '@smithy/util-uri-escape': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/querystring-builder@3.0.6':
+  '@smithy/querystring-parser@3.0.7':
     dependencies:
-      '@smithy/types': 3.4.2
-      '@smithy/util-uri-escape': 3.0.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/querystring-parser@2.2.0':
+  '@smithy/service-error-classification@3.0.7':
     dependencies:
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
+      '@smithy/types': 3.5.0
 
-  '@smithy/querystring-parser@3.0.3':
+  '@smithy/shared-ini-file-loader@3.1.8':
     dependencies:
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/querystring-parser@3.0.6':
-    dependencies:
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/service-error-classification@2.1.5':
-    dependencies:
-      '@smithy/types': 2.12.0
-
-  '@smithy/service-error-classification@3.0.3':
-    dependencies:
-      '@smithy/types': 3.3.0
-
-  '@smithy/service-error-classification@3.0.6':
-    dependencies:
-      '@smithy/types': 3.4.2
-
-  '@smithy/shared-ini-file-loader@2.4.0':
-    dependencies:
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/shared-ini-file-loader@3.1.4':
-    dependencies:
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/shared-ini-file-loader@3.1.7':
-    dependencies:
-      '@smithy/types': 3.4.2
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@smithy/signature-v4@1.1.0':
@@ -17345,54 +15821,26 @@ snapshots:
       '@smithy/util-uri-escape': 2.2.0
       '@smithy/util-utf8': 2.3.0
       tslib: 2.6.2
+    optional: true
 
-  '@smithy/signature-v4@4.1.0':
+  '@smithy/signature-v4@4.2.0':
     dependencies:
       '@smithy/is-array-buffer': 3.0.0
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/types': 3.3.0
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
       '@smithy/util-hex-encoding': 3.0.0
-      '@smithy/util-middleware': 3.0.3
+      '@smithy/util-middleware': 3.0.7
       '@smithy/util-uri-escape': 3.0.0
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/signature-v4@4.1.4':
+  '@smithy/smithy-client@3.4.0':
     dependencies:
-      '@smithy/is-array-buffer': 3.0.0
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/types': 3.4.2
-      '@smithy/util-hex-encoding': 3.0.0
-      '@smithy/util-middleware': 3.0.6
-      '@smithy/util-uri-escape': 3.0.0
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
-
-  '@smithy/smithy-client@2.5.1':
-    dependencies:
-      '@smithy/middleware-endpoint': 2.5.1
-      '@smithy/middleware-stack': 2.2.0
-      '@smithy/protocol-http': 3.3.0
-      '@smithy/types': 2.12.0
-      '@smithy/util-stream': 2.2.0
-      tslib: 2.6.2
-
-  '@smithy/smithy-client@3.2.0':
-    dependencies:
-      '@smithy/middleware-endpoint': 3.1.0
-      '@smithy/middleware-stack': 3.0.3
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/types': 3.3.0
-      '@smithy/util-stream': 3.1.3
-      tslib: 2.6.2
-
-  '@smithy/smithy-client@3.3.4':
-    dependencies:
-      '@smithy/middleware-endpoint': 3.1.3
-      '@smithy/middleware-stack': 3.0.6
-      '@smithy/protocol-http': 4.1.3
-      '@smithy/types': 3.4.2
-      '@smithy/util-stream': 3.1.8
+      '@smithy/middleware-endpoint': 3.1.4
+      '@smithy/middleware-stack': 3.0.7
+      '@smithy/protocol-http': 4.1.4
+      '@smithy/types': 3.5.0
+      '@smithy/util-stream': 3.1.9
       tslib: 2.6.2
 
   '@smithy/types@1.2.0':
@@ -17402,37 +15850,16 @@ snapshots:
   '@smithy/types@2.12.0':
     dependencies:
       tslib: 2.6.2
+    optional: true
 
-  '@smithy/types@3.3.0':
+  '@smithy/types@3.5.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/types@3.4.2':
+  '@smithy/url-parser@3.0.7':
     dependencies:
-      tslib: 2.6.2
-
-  '@smithy/url-parser@2.2.0':
-    dependencies:
-      '@smithy/querystring-parser': 2.2.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/url-parser@3.0.3':
-    dependencies:
-      '@smithy/querystring-parser': 3.0.3
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/url-parser@3.0.6':
-    dependencies:
-      '@smithy/querystring-parser': 3.0.6
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/util-base64@2.3.0':
-    dependencies:
-      '@smithy/util-buffer-from': 2.2.0
-      '@smithy/util-utf8': 2.3.0
+      '@smithy/querystring-parser': 3.0.7
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@smithy/util-base64@3.0.0':
@@ -17441,18 +15868,10 @@ snapshots:
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/util-body-length-browser@2.2.0':
-    dependencies:
-      tslib: 2.6.2
-
   '@smithy/util-body-length-browser@3.0.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-body-length-node@2.3.0':
-    dependencies:
-      tslib: 2.6.2
-
   '@smithy/util-body-length-node@3.0.0':
     dependencies:
       tslib: 2.6.2
@@ -17472,84 +15891,32 @@ snapshots:
       '@smithy/is-array-buffer': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/util-config-provider@2.3.0':
-    dependencies:
-      tslib: 2.6.2
-
   '@smithy/util-config-provider@3.0.0':
     dependencies:
       tslib: 2.6.2
 
-  '@smithy/util-defaults-mode-browser@2.2.1':
+  '@smithy/util-defaults-mode-browser@3.0.23':
     dependencies:
-      '@smithy/property-provider': 2.2.0
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
+      '@smithy/property-provider': 3.1.7
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
       bowser: 2.11.0
       tslib: 2.6.2
 
-  '@smithy/util-defaults-mode-browser@3.0.15':
+  '@smithy/util-defaults-mode-node@3.0.23':
     dependencies:
-      '@smithy/property-provider': 3.1.3
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      bowser: 2.11.0
+      '@smithy/config-resolver': 3.0.9
+      '@smithy/credential-provider-imds': 3.2.4
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/property-provider': 3.1.7
+      '@smithy/smithy-client': 3.4.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/util-defaults-mode-browser@3.0.20':
+  '@smithy/util-endpoints@2.1.3':
     dependencies:
-      '@smithy/property-provider': 3.1.6
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      bowser: 2.11.0
-      tslib: 2.6.2
-
-  '@smithy/util-defaults-mode-node@2.3.1':
-    dependencies:
-      '@smithy/config-resolver': 2.2.0
-      '@smithy/credential-provider-imds': 2.3.0
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/property-provider': 2.2.0
-      '@smithy/smithy-client': 2.5.1
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/util-defaults-mode-node@3.0.15':
-    dependencies:
-      '@smithy/config-resolver': 3.0.5
-      '@smithy/credential-provider-imds': 3.2.0
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/property-provider': 3.1.3
-      '@smithy/smithy-client': 3.2.0
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/util-defaults-mode-node@3.0.20':
-    dependencies:
-      '@smithy/config-resolver': 3.0.8
-      '@smithy/credential-provider-imds': 3.2.3
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/property-provider': 3.1.6
-      '@smithy/smithy-client': 3.3.4
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/util-endpoints@1.2.0':
-    dependencies:
-      '@smithy/node-config-provider': 2.3.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/util-endpoints@2.0.5':
-    dependencies:
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/util-endpoints@2.1.2':
-    dependencies:
-      '@smithy/node-config-provider': 3.1.7
-      '@smithy/types': 3.4.2
+      '@smithy/node-config-provider': 3.1.8
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@smithy/util-hex-encoding@1.1.0':
@@ -17559,6 +15926,7 @@ snapshots:
   '@smithy/util-hex-encoding@2.2.0':
     dependencies:
       tslib: 2.6.2
+    optional: true
 
   '@smithy/util-hex-encoding@3.0.0':
     dependencies:
@@ -17572,62 +15940,24 @@ snapshots:
     dependencies:
       '@smithy/types': 2.12.0
       tslib: 2.6.2
+    optional: true
 
-  '@smithy/util-middleware@3.0.3':
+  '@smithy/util-middleware@3.0.7':
     dependencies:
-      '@smithy/types': 3.3.0
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/util-middleware@3.0.6':
+  '@smithy/util-retry@3.0.7':
     dependencies:
-      '@smithy/types': 3.4.2
+      '@smithy/service-error-classification': 3.0.7
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
-  '@smithy/util-retry@2.2.0':
+  '@smithy/util-stream@3.1.9':
     dependencies:
-      '@smithy/service-error-classification': 2.1.5
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/util-retry@3.0.3':
-    dependencies:
-      '@smithy/service-error-classification': 3.0.3
-      '@smithy/types': 3.3.0
-      tslib: 2.6.2
-
-  '@smithy/util-retry@3.0.6':
-    dependencies:
-      '@smithy/service-error-classification': 3.0.6
-      '@smithy/types': 3.4.2
-      tslib: 2.6.2
-
-  '@smithy/util-stream@2.2.0':
-    dependencies:
-      '@smithy/fetch-http-handler': 2.5.0
-      '@smithy/node-http-handler': 2.5.0
-      '@smithy/types': 2.12.0
-      '@smithy/util-base64': 2.3.0
-      '@smithy/util-buffer-from': 2.2.0
-      '@smithy/util-hex-encoding': 2.2.0
-      '@smithy/util-utf8': 2.3.0
-      tslib: 2.6.2
-
-  '@smithy/util-stream@3.1.3':
-    dependencies:
-      '@smithy/fetch-http-handler': 3.2.4
-      '@smithy/node-http-handler': 3.1.4
-      '@smithy/types': 3.3.0
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-buffer-from': 3.0.0
-      '@smithy/util-hex-encoding': 3.0.0
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.2
-
-  '@smithy/util-stream@3.1.8':
-    dependencies:
-      '@smithy/fetch-http-handler': 3.2.8
-      '@smithy/node-http-handler': 3.2.3
-      '@smithy/types': 3.4.2
+      '@smithy/fetch-http-handler': 3.2.9
+      '@smithy/node-http-handler': 3.2.4
+      '@smithy/types': 3.5.0
       '@smithy/util-base64': 3.0.0
       '@smithy/util-buffer-from': 3.0.0
       '@smithy/util-hex-encoding': 3.0.0
@@ -17641,6 +15971,7 @@ snapshots:
   '@smithy/util-uri-escape@2.2.0':
     dependencies:
       tslib: 2.6.2
+    optional: true
 
   '@smithy/util-uri-escape@3.0.0':
     dependencies:
@@ -17661,130 +15992,124 @@ snapshots:
       '@smithy/util-buffer-from': 3.0.0
       tslib: 2.6.2
 
-  '@smithy/util-waiter@2.0.15':
+  '@smithy/util-waiter@3.1.6':
     dependencies:
-      '@smithy/abort-controller': 2.2.0
-      '@smithy/types': 2.12.0
-      tslib: 2.6.2
-
-  '@smithy/util-waiter@3.1.2':
-    dependencies:
-      '@smithy/abort-controller': 3.1.4
-      '@smithy/types': 3.4.2
+      '@smithy/abort-controller': 3.1.5
+      '@smithy/types': 3.5.0
       tslib: 2.6.2
 
   '@sqltools/formatter@1.2.5': {}
 
-  '@storybook/addon-a11y@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-a11y@8.3.5(storybook@8.3.5)':
     dependencies:
-      '@storybook/addon-highlight': 8.3.1(storybook@8.3.1)
+      '@storybook/addon-highlight': 8.3.5(storybook@8.3.5)
       axe-core: 4.7.2
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/addon-actions@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-actions@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/global': 5.0.0
       '@types/uuid': 9.0.8
       dequal: 2.0.3
       polished: 4.2.2
-      storybook: 8.3.1
+      storybook: 8.3.5
       uuid: 9.0.1
 
-  '@storybook/addon-backgrounds@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-backgrounds@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
-      storybook: 8.3.1
+      storybook: 8.3.5
       ts-dedent: 2.2.0
 
-  '@storybook/addon-controls@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-controls@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/global': 5.0.0
       dequal: 2.0.3
       lodash: 4.17.21
-      storybook: 8.3.1
+      storybook: 8.3.5
       ts-dedent: 2.2.0
 
-  '@storybook/addon-docs@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-docs@8.3.5(storybook@8.3.5)':
     dependencies:
       '@mdx-js/react': 3.0.1(@types/react@18.0.27)(react@18.2.0)
-      '@storybook/blocks': 8.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.1)
-      '@storybook/csf-plugin': 8.3.1(storybook@8.3.1)
+      '@storybook/blocks': 8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)
+      '@storybook/csf-plugin': 8.3.5(storybook@8.3.5)
       '@storybook/global': 5.0.0
-      '@storybook/react-dom-shim': 8.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.1)
+      '@storybook/react-dom-shim': 8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)
       '@types/react': 18.0.27
       fs-extra: 11.1.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       rehype-external-links: 3.0.0
       rehype-slug: 6.0.0
-      storybook: 8.3.1
+      storybook: 8.3.5
       ts-dedent: 2.2.0
 
-  '@storybook/addon-essentials@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-essentials@8.3.5(storybook@8.3.5)':
     dependencies:
-      '@storybook/addon-actions': 8.3.1(storybook@8.3.1)
-      '@storybook/addon-backgrounds': 8.3.1(storybook@8.3.1)
-      '@storybook/addon-controls': 8.3.1(storybook@8.3.1)
-      '@storybook/addon-docs': 8.3.1(storybook@8.3.1)
-      '@storybook/addon-highlight': 8.3.1(storybook@8.3.1)
-      '@storybook/addon-measure': 8.3.1(storybook@8.3.1)
-      '@storybook/addon-outline': 8.3.1(storybook@8.3.1)
-      '@storybook/addon-toolbars': 8.3.1(storybook@8.3.1)
-      '@storybook/addon-viewport': 8.3.1(storybook@8.3.1)
-      storybook: 8.3.1
+      '@storybook/addon-actions': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-backgrounds': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-controls': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-docs': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-highlight': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-measure': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-outline': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-toolbars': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-viewport': 8.3.5(storybook@8.3.5)
+      storybook: 8.3.5
       ts-dedent: 2.2.0
 
-  '@storybook/addon-highlight@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-highlight@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/addon-interactions@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-interactions@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/instrumenter': 8.3.1(storybook@8.3.1)
-      '@storybook/test': 8.3.1(storybook@8.3.1)
+      '@storybook/instrumenter': 8.3.5(storybook@8.3.5)
+      '@storybook/test': 8.3.5(storybook@8.3.5)
       polished: 4.2.2
-      storybook: 8.3.1
+      storybook: 8.3.5
       ts-dedent: 2.2.0
 
-  '@storybook/addon-links@8.3.1(react@18.2.0)(storybook@8.3.1)':
+  '@storybook/addon-links@8.3.5(react@18.2.0)(storybook@8.3.5)':
     dependencies:
       '@storybook/csf': 0.1.11
       '@storybook/global': 5.0.0
-      storybook: 8.3.1
+      storybook: 8.3.5
       ts-dedent: 2.2.0
     optionalDependencies:
       react: 18.2.0
 
-  '@storybook/addon-measure@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-measure@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.3.1
+      storybook: 8.3.5
       tiny-invariant: 1.3.3
 
-  '@storybook/addon-outline@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-outline@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.3.1
+      storybook: 8.3.5
       ts-dedent: 2.2.0
 
-  '@storybook/addon-themes@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-themes@8.3.5(storybook@8.3.5)':
     dependencies:
-      storybook: 8.3.1
+      storybook: 8.3.5
       ts-dedent: 2.2.0
 
-  '@storybook/addon-toolbars@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-toolbars@8.3.5(storybook@8.3.5)':
     dependencies:
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/addon-viewport@8.3.1(storybook@8.3.1)':
+  '@storybook/addon-viewport@8.3.5(storybook@8.3.5)':
     dependencies:
       memoizerific: 1.11.3
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/blocks@8.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.1)':
+  '@storybook/blocks@8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)':
     dependencies:
       '@storybook/csf': 0.1.11
       '@storybook/global': 5.0.0
@@ -17797,7 +16122,7 @@ snapshots:
       memoizerific: 1.11.3
       polished: 4.2.2
       react-colorful: 5.6.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      storybook: 8.3.1
+      storybook: 8.3.5
       telejson: 7.2.0
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
@@ -17805,37 +16130,37 @@ snapshots:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@storybook/builder-vite@8.3.1(storybook@8.3.1)(typescript@5.6.2)(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
+  '@storybook/builder-vite@8.3.5(storybook@8.3.5)(typescript@5.6.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
-      '@storybook/csf-plugin': 8.3.1(storybook@8.3.1)
+      '@storybook/csf-plugin': 8.3.5(storybook@8.3.5)
       '@types/find-cache-dir': 3.2.1
       browser-assert: 1.2.1
       es-module-lexer: 1.5.3
-      express: 4.21.0
+      express: 4.21.1
       find-cache-dir: 3.3.2
       fs-extra: 11.1.1
-      magic-string: 0.30.10
-      storybook: 8.3.1
+      magic-string: 0.30.11
+      storybook: 8.3.5
       ts-dedent: 2.2.0
-      vite: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
     optionalDependencies:
       typescript: 5.6.2
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/components@8.3.1(storybook@8.3.1)':
+  '@storybook/components@8.3.5(storybook@8.3.5)':
     dependencies:
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/core@8.3.1':
+  '@storybook/core@8.3.5':
     dependencies:
       '@storybook/csf': 0.1.11
       '@types/express': 4.17.21
       better-opn: 3.0.2
       browser-assert: 1.2.1
-      esbuild: 0.20.2
-      esbuild-register: 3.5.0(esbuild@0.20.2)
-      express: 4.21.0
+      esbuild: 0.24.0
+      esbuild-register: 3.5.0(esbuild@0.24.0)
+      express: 4.21.1
       jsdoc-type-pratt-parser: 4.1.0
       process: 0.11.10
       recast: 0.23.6
@@ -17847,9 +16172,9 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@storybook/csf-plugin@8.3.1(storybook@8.3.1)':
+  '@storybook/csf-plugin@8.3.5(storybook@8.3.5)':
     dependencies:
-      storybook: 8.3.1
+      storybook: 8.3.5
       unplugin: 1.11.0
 
   '@storybook/csf@0.1.11':
@@ -17863,73 +16188,73 @@ snapshots:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@storybook/instrumenter@8.3.1(storybook@8.3.1)':
+  '@storybook/instrumenter@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/global': 5.0.0
-      '@vitest/utils': 2.1.1
-      storybook: 8.3.1
+      '@vitest/utils': 2.1.2
+      storybook: 8.3.5
       util: 0.12.5
 
-  '@storybook/manager-api@8.3.1(storybook@8.3.1)':
+  '@storybook/manager-api@8.3.5(storybook@8.3.5)':
     dependencies:
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/preview-api@8.3.1(storybook@8.3.1)':
+  '@storybook/preview-api@8.3.5(storybook@8.3.5)':
     dependencies:
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/react-dom-shim@8.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.1)':
+  '@storybook/react-dom-shim@8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)':
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/test@8.3.1(storybook@8.3.1)':
+  '@storybook/test@8.3.5(storybook@8.3.5)':
     dependencies:
       '@storybook/csf': 0.1.11
       '@storybook/global': 5.0.0
-      '@storybook/instrumenter': 8.3.1(storybook@8.3.1)
+      '@storybook/instrumenter': 8.3.5(storybook@8.3.5)
       '@testing-library/dom': 10.4.0
       '@testing-library/jest-dom': 6.5.0
       '@testing-library/user-event': 14.5.2(@testing-library/dom@10.4.0)
       '@vitest/expect': 2.0.5
       '@vitest/spy': 2.0.5
-      storybook: 8.3.1
+      storybook: 8.3.5
       util: 0.12.5
 
-  '@storybook/theming@8.3.1(storybook@8.3.1)':
+  '@storybook/theming@8.3.5(storybook@8.3.5)':
     dependencies:
-      storybook: 8.3.1
+      storybook: 8.3.5
 
-  '@storybook/vue3-vite@8.3.1(storybook@8.3.1)(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.4.21(typescript@5.6.2))':
+  '@storybook/vue3-vite@8.3.5(storybook@8.3.5)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@storybook/builder-vite': 8.3.1(storybook@8.3.1)(typescript@5.6.2)(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
-      '@storybook/vue3': 8.3.1(storybook@8.3.1)(vue@3.4.21(typescript@5.6.2))
+      '@storybook/builder-vite': 8.3.5(storybook@8.3.5)(typescript@5.6.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
+      '@storybook/vue3': 8.3.5(storybook@8.3.5)(vue@3.5.11(typescript@5.6.2))
       find-package-json: 1.2.0
-      magic-string: 0.30.10
-      storybook: 8.3.1
+      magic-string: 0.30.11
+      storybook: 8.3.5
       typescript: 5.6.2
-      vite: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
-      vue-component-meta: 2.0.19(typescript@5.6.2)
-      vue-docgen-api: 4.76.0(vue@3.4.21(typescript@5.6.2))
+      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vue-component-meta: 2.1.6(typescript@5.6.2)
+      vue-docgen-api: 4.76.0(vue@3.5.11(typescript@5.6.2))
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - supports-color
       - vite-plugin-glimmerx
       - vue
 
-  '@storybook/vue3@8.3.1(storybook@8.3.1)(vue@3.4.21(typescript@5.6.2))':
+  '@storybook/vue3@8.3.5(storybook@8.3.5)(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@storybook/components': 8.3.1(storybook@8.3.1)
+      '@storybook/components': 8.3.5(storybook@8.3.5)
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 8.3.1(storybook@8.3.1)
-      '@storybook/preview-api': 8.3.1(storybook@8.3.1)
-      '@storybook/theming': 8.3.1(storybook@8.3.1)
-      '@vue/compiler-core': 3.4.21
-      storybook: 8.3.1
+      '@storybook/manager-api': 8.3.5(storybook@8.3.5)
+      '@storybook/preview-api': 8.3.5(storybook@8.3.5)
+      '@storybook/theming': 8.3.5(storybook@8.3.5)
+      '@vue/compiler-core': 3.5.11
+      storybook: 8.3.5
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
       vue-component-type-helpers: 2.1.6
 
   '@supabase/auth-js@2.65.0':
@@ -17952,7 +16277,7 @@ snapshots:
     dependencies:
       '@supabase/node-fetch': 2.6.15
       '@types/phoenix': 1.6.4
-      '@types/ws': 8.5.10
+      '@types/ws': 8.5.12
       ws: 8.17.1
     transitivePeerDependencies:
       - bufferutil
@@ -18024,16 +16349,14 @@ snapshots:
     dependencies:
       '@testing-library/dom': 10.4.0
 
-  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.4.21)(@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))':
+  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.5.11)(vue@3.5.11(typescript@5.6.2))':
     dependencies:
       '@babel/runtime': 7.24.7
       '@testing-library/dom': 9.3.3
-      '@vue/test-utils': 2.4.3(@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))
-      vue: 3.4.21(typescript@5.6.2)
+      '@vue/test-utils': 2.4.6
+      vue: 3.5.11(typescript@5.6.2)
     optionalDependencies:
-      '@vue/compiler-sfc': 3.4.21
-    transitivePeerDependencies:
-      - '@vue/server-renderer'
+      '@vue/compiler-sfc': 3.5.11
 
   '@tokenizer/token@0.3.0': {}
 
@@ -18058,10 +16381,6 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
-  '@types/archiver@6.0.2':
-    dependencies:
-      '@types/readdir-glob': 1.1.5
-
   '@types/argparse@1.0.38': {}
 
   '@types/aria-query@5.0.1': {}
@@ -18130,7 +16449,7 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
-  '@types/cookie-parser@1.4.3':
+  '@types/cookie-parser@1.4.7':
     dependencies:
       '@types/express': 4.17.21
 
@@ -18147,7 +16466,7 @@ snapshots:
 
   '@types/estree@1.0.0': {}
 
-  '@types/estree@1.0.5': {}
+  '@types/estree@1.0.6': {}
 
   '@types/eventsource@1.1.9': {}
 
@@ -18319,7 +16638,7 @@ snapshots:
       '@types/tedious': 4.0.9
       tarn: 3.0.2
 
-  '@types/multer@1.4.11':
+  '@types/multer@1.4.12':
     dependencies:
       '@types/express': 4.17.21
 
@@ -18374,10 +16693,6 @@ snapshots:
       '@types/node': 18.16.16
       safe-buffer: 5.1.2
 
-  '@types/readdir-glob@1.1.5':
-    dependencies:
-      '@types/node': 18.16.16
-
   '@types/replacestream@4.0.1': {}
 
   '@types/request@2.48.12':
@@ -18464,10 +16779,6 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
-  '@types/tar-stream@3.1.3':
-    dependencies:
-      '@types/node': 18.16.16
-
   '@types/tedious@4.0.9':
     dependencies:
       '@types/node': 18.16.16
@@ -18482,16 +16793,14 @@ snapshots:
 
   '@types/tough-cookie@4.0.2': {}
 
+  '@types/triple-beam@1.3.5': {}
+
   '@types/tunnel@0.0.3':
     dependencies:
       '@types/node': 18.16.16
 
   '@types/unist@3.0.2': {}
 
-  '@types/unzip-stream@0.3.4':
-    dependencies:
-      '@types/node': 18.16.16
-
   '@types/utf8@3.0.3': {}
 
   '@types/uuencode@0.0.3(patch_hash=3i7wecddkama6vhpu5o37g24u4)':
@@ -18518,7 +16827,7 @@ snapshots:
     dependencies:
       '@types/webidl-conversions': 7.0.0
 
-  '@types/ws@8.5.10':
+  '@types/ws@8.5.12':
     dependencies:
       '@types/node': 18.16.16
 
@@ -18590,7 +16899,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.6.2)
       '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.6.2)
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       eslint: 8.57.0
       ts-api-utils: 1.0.1(typescript@5.6.2)
     optionalDependencies:
@@ -18606,7 +16915,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -18621,7 +16930,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.2.0
       '@typescript-eslint/visitor-keys': 7.2.0
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -18672,16 +16981,16 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-vue@5.1.4(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.4.21(typescript@5.6.2))':
+  '@vitejs/plugin-vue@5.1.4(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      vite: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
-      vue: 3.4.21(typescript@5.6.2)
+      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vue: 3.5.11(typescript@5.6.2)
 
-  '@vitest/coverage-v8@2.1.1(vitest@2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
+  '@vitest/coverage-v8@2.1.2(vitest@2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 0.2.3
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
@@ -18691,7 +17000,7 @@ snapshots:
       std-env: 3.7.0
       test-exclude: 7.0.1
       tinyrainbow: 1.2.0
-      vitest: 2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vitest: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -18702,37 +17011,37 @@ snapshots:
       chai: 5.1.1
       tinyrainbow: 1.2.0
 
-  '@vitest/expect@2.1.1':
+  '@vitest/expect@2.1.2':
     dependencies:
-      '@vitest/spy': 2.1.1
-      '@vitest/utils': 2.1.1
+      '@vitest/spy': 2.1.2
+      '@vitest/utils': 2.1.2
       chai: 5.1.1
       tinyrainbow: 1.2.0
 
-  '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
+  '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
-      '@vitest/spy': 2.1.1
+      '@vitest/spy': 2.1.2
       estree-walker: 3.0.3
       magic-string: 0.30.11
     optionalDependencies:
-      vite: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
 
   '@vitest/pretty-format@2.0.5':
     dependencies:
       tinyrainbow: 1.2.0
 
-  '@vitest/pretty-format@2.1.1':
+  '@vitest/pretty-format@2.1.2':
     dependencies:
       tinyrainbow: 1.2.0
 
-  '@vitest/runner@2.1.1':
+  '@vitest/runner@2.1.2':
     dependencies:
-      '@vitest/utils': 2.1.1
+      '@vitest/utils': 2.1.2
       pathe: 1.1.2
 
-  '@vitest/snapshot@2.1.1':
+  '@vitest/snapshot@2.1.2':
     dependencies:
-      '@vitest/pretty-format': 2.1.1
+      '@vitest/pretty-format': 2.1.2
       magic-string: 0.30.11
       pathe: 1.1.2
 
@@ -18740,7 +17049,7 @@ snapshots:
     dependencies:
       tinyspy: 3.0.2
 
-  '@vitest/spy@2.1.1':
+  '@vitest/spy@2.1.2':
     dependencies:
       tinyspy: 3.0.2
 
@@ -18751,106 +17060,95 @@ snapshots:
       loupe: 3.1.1
       tinyrainbow: 1.2.0
 
-  '@vitest/utils@2.1.1':
+  '@vitest/utils@2.1.2':
     dependencies:
-      '@vitest/pretty-format': 2.1.1
+      '@vitest/pretty-format': 2.1.2
       loupe: 3.1.1
       tinyrainbow: 1.2.0
 
-  '@volar/language-core@1.11.1':
+  '@volar/language-core@2.4.6':
     dependencies:
-      '@volar/source-map': 1.11.1
+      '@volar/source-map': 2.4.6
 
-  '@volar/language-core@2.2.5':
-    dependencies:
-      '@volar/source-map': 2.2.5
+  '@volar/source-map@2.4.6': {}
 
-  '@volar/source-map@1.11.1':
+  '@volar/typescript@2.4.6':
     dependencies:
-      muggle-string: 0.3.1
-
-  '@volar/source-map@2.2.5':
-    dependencies:
-      muggle-string: 0.4.1
-
-  '@volar/typescript@1.11.1':
-    dependencies:
-      '@volar/language-core': 1.11.1
+      '@volar/language-core': 2.4.6
       path-browserify: 1.0.1
+      vscode-uri: 3.0.8
 
-  '@volar/typescript@2.2.5':
+  '@vue-flow/background@1.3.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@volar/language-core': 2.2.5
-      path-browserify: 1.0.1
+      '@vue-flow/core': 1.41.2(vue@3.5.11(typescript@5.6.2))
+      vue: 3.5.11(typescript@5.6.2)
 
-  '@vue-flow/background@1.3.0(@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))':
+  '@vue-flow/controls@1.1.2(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@vue-flow/core': 1.33.5(vue@3.4.21(typescript@5.6.2))
-      vue: 3.4.21(typescript@5.6.2)
+      '@vue-flow/core': 1.41.2(vue@3.5.11(typescript@5.6.2))
+      vue: 3.5.11(typescript@5.6.2)
 
-  '@vue-flow/controls@1.1.1(@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))':
+  '@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@vue-flow/core': 1.33.5(vue@3.4.21(typescript@5.6.2))
-      vue: 3.4.21(typescript@5.6.2)
-
-  '@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2))':
-    dependencies:
-      '@vueuse/core': 10.11.0(vue@3.4.21(typescript@5.6.2))
+      '@vueuse/core': 10.11.0(vue@3.5.11(typescript@5.6.2))
       d3-drag: 3.0.0
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
-  '@vue-flow/minimap@1.4.0(@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))':
+  '@vue-flow/minimap@1.5.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@vue-flow/core': 1.33.5(vue@3.4.21(typescript@5.6.2))
+      '@vue-flow/core': 1.41.2(vue@3.5.11(typescript@5.6.2))
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.33.5(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))':
+  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@vue-flow/core': 1.33.5(vue@3.4.21(typescript@5.6.2))
+      '@vue-flow/core': 1.41.2(vue@3.5.11(typescript@5.6.2))
       d3-drag: 3.0.0
       d3-selection: 3.0.0
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  '@vue/compiler-core@3.4.21':
+  '@vue/compiler-core@3.5.11':
     dependencies:
-      '@babel/parser': 7.24.6
-      '@vue/shared': 3.4.21
+      '@babel/parser': 7.25.6
+      '@vue/shared': 3.5.11
       entities: 4.5.0
       estree-walker: 2.0.2
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
-  '@vue/compiler-dom@3.4.21':
+  '@vue/compiler-dom@3.5.11':
     dependencies:
-      '@vue/compiler-core': 3.4.21
-      '@vue/shared': 3.4.21
+      '@vue/compiler-core': 3.5.11
+      '@vue/shared': 3.5.11
 
-  '@vue/compiler-sfc@3.4.21':
+  '@vue/compiler-sfc@3.5.11':
     dependencies:
-      '@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
+      '@babel/parser': 7.25.6
+      '@vue/compiler-core': 3.5.11
+      '@vue/compiler-dom': 3.5.11
+      '@vue/compiler-ssr': 3.5.11
+      '@vue/shared': 3.5.11
       estree-walker: 2.0.2
-      magic-string: 0.30.10
-      postcss: 8.4.38
-      source-map-js: 1.2.0
+      magic-string: 0.30.11
+      postcss: 8.4.47
+      source-map-js: 1.2.1
 
-  '@vue/compiler-ssr@3.4.21':
+  '@vue/compiler-ssr@3.5.11':
     dependencies:
-      '@vue/compiler-dom': 3.4.21
-      '@vue/shared': 3.4.21
+      '@vue/compiler-dom': 3.5.11
+      '@vue/shared': 3.5.11
+
+  '@vue/compiler-vue2@2.7.16':
+    dependencies:
+      de-indent: 1.0.2
+      he: 1.2.0
 
   '@vue/devtools-api@6.4.5': {}
 
-  '@vue/devtools-api@6.5.0': {}
-
   '@vue/devtools-api@6.6.4': {}
 
   '@vue/eslint-config-typescript@13.0.0(eslint-plugin-vue@9.23.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.6.2)':
@@ -18865,88 +17163,73 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vue/language-core@1.8.27(typescript@5.6.2)':
+  '@vue/language-core@2.1.6(typescript@5.6.2)':
     dependencies:
-      '@volar/language-core': 1.11.1
-      '@volar/source-map': 1.11.1
-      '@vue/compiler-dom': 3.4.21
-      '@vue/shared': 3.4.21
+      '@volar/language-core': 2.4.6
+      '@vue/compiler-dom': 3.5.11
+      '@vue/compiler-vue2': 2.7.16
+      '@vue/shared': 3.5.11
       computeds: 0.0.1
       minimatch: 9.0.5
-      muggle-string: 0.3.1
+      muggle-string: 0.4.1
       path-browserify: 1.0.1
-      vue-template-compiler: 2.7.14
     optionalDependencies:
       typescript: 5.6.2
 
-  '@vue/language-core@2.0.19(typescript@5.6.2)':
+  '@vue/reactivity@3.5.11':
     dependencies:
-      '@volar/language-core': 2.2.5
-      '@vue/compiler-dom': 3.4.21
-      '@vue/shared': 3.4.21
-      computeds: 0.0.1
-      minimatch: 9.0.5
-      path-browserify: 1.0.1
-      vue-template-compiler: 2.7.14
-    optionalDependencies:
-      typescript: 5.6.2
+      '@vue/shared': 3.5.11
 
-  '@vue/reactivity@3.4.21':
+  '@vue/runtime-core@3.5.11':
     dependencies:
-      '@vue/shared': 3.4.21
+      '@vue/reactivity': 3.5.11
+      '@vue/shared': 3.5.11
 
-  '@vue/runtime-core@3.4.21':
+  '@vue/runtime-dom@3.5.11':
     dependencies:
-      '@vue/reactivity': 3.4.21
-      '@vue/shared': 3.4.21
-
-  '@vue/runtime-dom@3.4.21':
-    dependencies:
-      '@vue/runtime-core': 3.4.21
-      '@vue/shared': 3.4.21
+      '@vue/reactivity': 3.5.11
+      '@vue/runtime-core': 3.5.11
+      '@vue/shared': 3.5.11
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.6.2))':
+  '@vue/server-renderer@3.5.11(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@vue/compiler-ssr': 3.4.21
-      '@vue/shared': 3.4.21
-      vue: 3.4.21(typescript@5.6.2)
+      '@vue/compiler-ssr': 3.5.11
+      '@vue/shared': 3.5.11
+      vue: 3.5.11(typescript@5.6.2)
 
-  '@vue/shared@3.4.21': {}
+  '@vue/shared@3.5.11': {}
 
-  '@vue/test-utils@2.4.3(@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.6.2)))(vue@3.4.21(typescript@5.6.2))':
+  '@vue/test-utils@2.4.6':
     dependencies:
       js-beautify: 1.14.9
-      vue: 3.4.21(typescript@5.6.2)
-      vue-component-type-helpers: 1.8.25
-    optionalDependencies:
-      '@vue/server-renderer': 3.4.21(vue@3.4.21(typescript@5.6.2))
+      vue-component-type-helpers: 2.1.6
 
-  '@vueuse/components@10.11.0(vue@3.4.21(typescript@5.6.2))':
+  '@vueuse/components@10.11.0(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      '@vueuse/core': 10.11.0(vue@3.4.21(typescript@5.6.2))
-      '@vueuse/shared': 10.11.0(vue@3.4.21(typescript@5.6.2))
-      vue-demi: 0.14.8(vue@3.4.21(typescript@5.6.2))
+      '@vueuse/core': 10.11.0(vue@3.5.11(typescript@5.6.2))
+      '@vueuse/shared': 10.11.0(vue@3.5.11(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/core@10.11.0(vue@3.4.21(typescript@5.6.2))':
+  '@vueuse/core@10.11.0(vue@3.5.11(typescript@5.6.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.11.0
-      '@vueuse/shared': 10.11.0(vue@3.4.21(typescript@5.6.2))
-      vue-demi: 0.14.8(vue@3.4.21(typescript@5.6.2))
+      '@vueuse/shared': 10.11.0(vue@3.5.11(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/core@9.13.0(vue@3.4.21(typescript@5.6.2))':
+  '@vueuse/core@9.13.0(vue@3.5.11(typescript@5.6.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.16
       '@vueuse/metadata': 9.13.0
-      '@vueuse/shared': 9.13.0(vue@3.4.21(typescript@5.6.2))
-      vue-demi: 0.14.8(vue@3.4.21(typescript@5.6.2))
+      '@vueuse/shared': 9.13.0(vue@3.5.11(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -18955,23 +17238,23 @@ snapshots:
 
   '@vueuse/metadata@9.13.0': {}
 
-  '@vueuse/shared@10.11.0(vue@3.4.21(typescript@5.6.2))':
+  '@vueuse/shared@10.11.0(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      vue-demi: 0.14.8(vue@3.4.21(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/shared@9.13.0(vue@3.4.21(typescript@5.6.2))':
+  '@vueuse/shared@9.13.0(vue@3.5.11(typescript@5.6.2))':
     dependencies:
-      vue-demi: 0.14.8(vue@3.4.21(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
   '@vvo/tzdb@6.141.0': {}
 
-  '@xata.io/client@0.30.0(typescript@5.6.2)':
+  '@xata.io/client@0.28.4(typescript@5.6.2)':
     dependencies:
       typescript: 5.6.2
 
@@ -19003,6 +17286,11 @@ snapshots:
 
   acorn-walk@8.3.2: {}
 
+  acorn-walk@8.3.4:
+    dependencies:
+      acorn: 8.12.1
+    optional: true
+
   acorn@7.4.1: {}
 
   acorn@8.12.1: {}
@@ -19011,19 +17299,19 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
   agentkeepalive@4.2.1:
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       depd: 1.1.2
       humanize-ms: 1.2.1
     transitivePeerDependencies:
@@ -19034,6 +17322,10 @@ snapshots:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
+  ajv-draft-04@1.0.0(ajv@8.13.0):
+    optionalDependencies:
+      ajv: 8.13.0
+
   ajv-draft-04@1.0.0(ajv@8.17.1):
     optionalDependencies:
       ajv: 8.17.1
@@ -19042,6 +17334,10 @@ snapshots:
     optionalDependencies:
       ajv: 8.17.1
 
+  ajv-formats@3.0.1(ajv@8.13.0):
+    optionalDependencies:
+      ajv: 8.13.0
+
   ajv@6.12.6:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -19049,6 +17345,20 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
+  ajv@8.12.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
+
+  ajv@8.13.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
+
   ajv@8.17.1:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -19112,26 +17422,6 @@ snapshots:
 
   arch@2.2.0: {}
 
-  archiver-utils@5.0.2:
-    dependencies:
-      glob: 10.4.5
-      graceful-fs: 4.2.11
-      is-stream: 2.0.1
-      lazystream: 1.0.1
-      lodash: 4.17.21
-      normalize-path: 3.0.0
-      readable-stream: 4.5.2
-
-  archiver@7.0.1:
-    dependencies:
-      archiver-utils: 5.0.2
-      async: 3.2.4
-      buffer-crc32: 1.0.0
-      readable-stream: 4.5.2
-      readdir-glob: 1.1.3
-      tar-stream: 3.1.7
-      zip-stream: 6.0.1
-
   are-we-there-yet@3.0.1:
     dependencies:
       delegates: 1.0.0
@@ -19188,6 +17478,15 @@ snapshots:
 
   array-union@2.1.0: {}
 
+  array.prototype.filter@1.0.4:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-array-method-boxes-properly: 1.0.0
+      es-object-atoms: 1.0.0
+      is-string: 1.0.7
+
   array.prototype.findlastindex@1.2.3:
     dependencies:
       call-bind: 1.0.7
@@ -19299,7 +17598,7 @@ snapshots:
   autoprefixer@10.4.19(postcss@8.4.38):
     dependencies:
       browserslist: 4.23.0
-      caniuse-lite: 1.0.30001617
+      caniuse-lite: 1.0.30001667
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.0.1
@@ -19325,7 +17624,7 @@ snapshots:
       '@babel/runtime': 7.24.7
       is-retry-allowed: 2.2.0
 
-  axios@1.7.3(debug@4.3.6):
+  axios@1.7.4:
     dependencies:
       follow-redirects: 1.15.6(debug@4.3.6)
       form-data: 4.0.0
@@ -19333,9 +17632,17 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  axios@1.7.4:
+  axios@1.7.7:
     dependencies:
-      follow-redirects: 1.15.6(debug@4.3.7)
+      follow-redirects: 1.15.6(debug@4.3.6)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
+  axios@1.7.7(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:
@@ -19349,8 +17656,6 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  b4a@1.6.7: {}
-
   babel-jest@29.6.2(@babel/core@7.24.0):
     dependencies:
       '@babel/core': 7.24.0
@@ -19409,9 +17714,6 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
-  bare-events@2.5.0:
-    optional: true
-
   base-64@1.0.0: {}
 
   base64-js@1.5.1: {}
@@ -19436,11 +17738,6 @@ snapshots:
 
   binary-extensions@2.2.0: {}
 
-  binary@0.3.0:
-    dependencies:
-      buffers: 0.1.1
-      chainsaw: 0.1.0
-
   binascii@0.0.2: {}
 
   bindings@1.5.0:
@@ -19460,7 +17757,7 @@ snapshots:
       '@types/readable-stream': 4.0.10
       buffer: 6.0.3
       inherits: 2.0.4
-      readable-stream: 4.5.2
+      readable-stream: 4.4.2
 
   blob-util@2.0.2: {}
 
@@ -19504,9 +17801,9 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
-  braces@3.0.2:
+  braces@3.0.3:
     dependencies:
-      fill-range: 7.0.1
+      fill-range: 7.1.1
 
   browser-assert@1.2.1: {}
 
@@ -19514,7 +17811,7 @@ snapshots:
 
   browserslist@4.23.0:
     dependencies:
-      caniuse-lite: 1.0.30001597
+      caniuse-lite: 1.0.30001667
       electron-to-chromium: 1.4.703
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.23.0)
@@ -19527,12 +17824,10 @@ snapshots:
     dependencies:
       node-int64: 0.4.0
 
-  bson@6.3.0: {}
+  bson@6.8.0: {}
 
   buffer-crc32@0.2.13: {}
 
-  buffer-crc32@1.0.0: {}
-
   buffer-equal-constant-time@1.0.1: {}
 
   buffer-from@1.1.2: {}
@@ -19549,8 +17844,6 @@ snapshots:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  buffers@0.1.1: {}
-
   buildcheck@0.0.6:
     optional: true
 
@@ -19652,9 +17945,7 @@ snapshots:
 
   camelize@1.0.1: {}
 
-  caniuse-lite@1.0.30001597: {}
-
-  caniuse-lite@1.0.30001617: {}
+  caniuse-lite@1.0.30001667: {}
 
   capital-case@1.0.4:
     dependencies:
@@ -19672,10 +17963,6 @@ snapshots:
       loupe: 3.1.1
       pathval: 2.0.0
 
-  chainsaw@0.1.0:
-    dependencies:
-      traverse: 0.3.9
-
   chalk@2.4.2:
     dependencies:
       ansi-styles: 3.2.1
@@ -19707,6 +17994,8 @@ snapshots:
       snake-case: 3.0.4
       tslib: 2.6.2
 
+  change-case@5.4.4: {}
+
   char-regex@1.0.2: {}
 
   character-parser@2.2.0:
@@ -19740,14 +18029,28 @@ snapshots:
       css-what: 6.1.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
-      domutils: 3.0.1
+      domutils: 3.1.0
+
+  cheerio@1.0.0:
+    dependencies:
+      cheerio-select: 2.1.0
+      dom-serializer: 2.0.0
+      domhandler: 5.0.3
+      domutils: 3.1.0
+      encoding-sniffer: 0.2.0
+      htmlparser2: 9.1.0
+      parse5: 7.1.2
+      parse5-htmlparser2-tree-adapter: 7.0.0
+      parse5-parser-stream: 7.1.2
+      undici: 6.19.7
+      whatwg-mimetype: 4.0.0
 
   cheerio@1.0.0-rc.12:
     dependencies:
       cheerio-select: 2.1.0
       dom-serializer: 2.0.0
       domhandler: 5.0.3
-      domutils: 3.0.1
+      domutils: 3.1.0
       htmlparser2: 8.0.2
       parse5: 7.1.2
       parse5-htmlparser2-tree-adapter: 7.0.0
@@ -19761,17 +18064,9 @@ snapshots:
       parse5: 6.0.1
       parse5-htmlparser2-tree-adapter: 6.0.1
 
-  chokidar@3.5.2:
+  chokidar@4.0.1:
     dependencies:
-      anymatch: 3.1.3
-      braces: 3.0.2
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.6.0
-    optionalDependencies:
-      fsevents: 2.3.3
+      readdirp: 4.0.2
 
   chownr@1.1.4: {}
 
@@ -19840,7 +18135,7 @@ snapshots:
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
-  clsx@1.2.1: {}
+  clsx@2.1.1: {}
 
   cluster-key-slot@1.1.2: {}
 
@@ -19860,10 +18155,10 @@ snapshots:
       '@lezer/html': 1.3.0
       '@lezer/lr': 1.4.0
 
-  cohere-ai@7.13.2(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(encoding@0.1.13):
+  cohere-ai@7.13.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13):
     dependencies:
-      '@aws-sdk/client-sagemaker': 3.646.0
-      '@aws-sdk/credential-providers': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
+      '@aws-sdk/client-sagemaker': 3.666.0
+      '@aws-sdk/credential-providers': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))
       '@aws-sdk/protocol-http': 3.374.0
       '@aws-sdk/signature-v4': 3.374.0
       form-data: 4.0.0
@@ -19941,18 +18236,12 @@ snapshots:
 
   commondir@1.0.1: {}
 
+  compare-versions@6.1.1: {}
+
   component-emitter@1.3.0: {}
 
   component-type@1.2.1: {}
 
-  compress-commons@6.0.2:
-    dependencies:
-      crc-32: 1.2.2
-      crc32-stream: 6.0.0
-      is-stream: 2.0.1
-      normalize-path: 3.0.0
-      readable-stream: 4.5.2
-
   compressible@2.0.18:
     dependencies:
       mime-db: 1.52.0
@@ -20037,18 +18326,18 @@ snapshots:
       lodash.clonedeep: 4.5.0
       yargs-parser: 20.2.9
 
-  cookie-parser@1.4.6:
+  cookie-parser@1.4.7:
     dependencies:
-      cookie: 0.4.1
+      cookie: 0.7.2
       cookie-signature: 1.0.6
 
   cookie-signature@1.0.6: {}
 
-  cookie@0.4.1: {}
-
   cookie@0.4.2: {}
 
-  cookie@0.6.0: {}
+  cookie@0.7.1: {}
+
+  cookie@0.7.2: {}
 
   cookiejar@2.1.4: {}
 
@@ -20068,13 +18357,6 @@ snapshots:
       nan: 2.20.0
     optional: true
 
-  crc-32@1.2.2: {}
-
-  crc32-stream@6.0.0:
-    dependencies:
-      crc-32: 1.2.2
-      readable-stream: 4.5.2
-
   create-require@1.1.1:
     optional: true
 
@@ -20088,7 +18370,7 @@ snapshots:
 
   cron-parser@4.9.0:
     dependencies:
-      luxon: 3.4.4
+      luxon: 3.5.0
 
   cron@3.1.7:
     dependencies:
@@ -20141,7 +18423,7 @@ snapshots:
       boolbase: 1.0.0
       css-what: 6.1.0
       domhandler: 5.0.3
-      domutils: 3.0.1
+      domutils: 3.1.0
       nth-check: 2.1.1
 
   css-to-react-native@3.2.0:
@@ -20176,12 +18458,12 @@ snapshots:
 
   csv-parse@5.5.0: {}
 
-  curlconverter@3.21.0(chokidar@3.5.2):
+  curlconverter@3.21.0(chokidar@4.0.1):
     dependencies:
       '@curlconverter/yargs': 0.0.2
       cookie: 0.4.2
       jsesc: 3.0.2
-      nunjucks: 3.2.4(chokidar@3.5.2)
+      nunjucks: 3.2.4(chokidar@4.0.1)
       query-string: 7.1.3
       string.prototype.startswith: 1.0.0
       yamljs: 0.3.0
@@ -20303,6 +18585,24 @@ snapshots:
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.0.0
 
+  data-view-buffer@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  data-view-byte-length@1.0.1:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
+  data-view-byte-offset@1.0.0:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+
   date-fns-tz@2.0.0(date-fns@2.30.0):
     dependencies:
       date-fns: 2.30.0
@@ -20455,6 +18755,8 @@ snapshots:
     dependencies:
       path-type: 4.0.0
 
+  discontinuous-range@1.0.0: {}
+
   dlv@1.1.3: {}
 
   doctrine@2.1.0:
@@ -20503,7 +18805,7 @@ snapshots:
 
   dommatrix@1.0.3: {}
 
-  dompurify@2.4.7: {}
+  dompurify@3.1.7: {}
 
   domutils@2.8.0:
     dependencies:
@@ -20582,15 +18884,15 @@ snapshots:
 
   electron-to-chromium@1.4.703: {}
 
-  element-plus@2.4.3(vue@3.4.21(typescript@5.6.2)):
+  element-plus@2.4.3(vue@3.5.11(typescript@5.6.2)):
     dependencies:
       '@ctrl/tinycolor': 3.6.0
-      '@element-plus/icons-vue': 2.3.1(vue@3.4.21(typescript@5.6.2))
+      '@element-plus/icons-vue': 2.3.1(vue@3.5.11(typescript@5.6.2))
       '@floating-ui/dom': 1.4.5
       '@popperjs/core': '@sxzz/popperjs-es@2.11.7'
       '@types/lodash': 4.14.195
       '@types/lodash-es': 4.17.6
-      '@vueuse/core': 9.13.0(vue@3.4.21(typescript@5.6.2))
+      '@vueuse/core': 9.13.0(vue@3.5.11(typescript@5.6.2))
       async-validator: 4.2.5
       dayjs: 1.11.10
       escape-html: 1.0.3
@@ -20599,7 +18901,7 @@ snapshots:
       lodash-unified: 1.0.3(@types/lodash-es@4.17.6)(lodash-es@4.17.21)(lodash@4.17.21)
       memoize-one: 6.0.0
       normalize-wheel-es: 1.2.0
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
@@ -20619,6 +18921,11 @@ snapshots:
 
   encoding-japanese@2.0.0: {}
 
+  encoding-sniffer@0.2.0:
+    dependencies:
+      iconv-lite: 0.6.3
+      whatwg-encoding: 3.1.1
+
   encoding@0.1.13:
     dependencies:
       iconv-lite: 0.6.3
@@ -20647,6 +18954,36 @@ snapshots:
   env-paths@2.2.1:
     optional: true
 
+  enzyme-shallow-equal@1.0.7:
+    dependencies:
+      hasown: 2.0.2
+      object-is: 1.1.5
+
+  enzyme@3.11.0:
+    dependencies:
+      array.prototype.flat: 1.3.2
+      cheerio: 1.0.0
+      enzyme-shallow-equal: 1.0.7
+      function.prototype.name: 1.1.6
+      has: 1.0.4
+      html-element-map: 1.3.1
+      is-boolean-object: 1.1.2
+      is-callable: 1.2.7
+      is-number-object: 1.0.7
+      is-regex: 1.1.4
+      is-string: 1.0.7
+      is-subset: 0.1.1
+      lodash.escape: 4.0.1
+      lodash.isequal: 4.5.0
+      object-inspect: 1.13.2
+      object-is: 1.1.6
+      object.assign: 4.1.5
+      object.entries: 1.1.8
+      object.values: 1.2.0
+      raf: 3.4.1
+      rst-selector-parser: 2.2.3
+      string.prototype.trim: 1.2.9
+
   epub2@3.0.2(ts-toolbelt@9.6.0):
     dependencies:
       adm-zip: 0.5.10
@@ -20750,6 +19087,55 @@ snapshots:
       unbox-primitive: 1.0.2
       which-typed-array: 1.1.15
 
+  es-abstract@1.23.3:
+    dependencies:
+      array-buffer-byte-length: 1.0.1
+      arraybuffer.prototype.slice: 1.0.3
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.7
+      data-view-buffer: 1.0.1
+      data-view-byte-length: 1.0.1
+      data-view-byte-offset: 1.0.0
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-set-tostringtag: 2.0.3
+      es-to-primitive: 1.2.1
+      function.prototype.name: 1.1.6
+      get-intrinsic: 1.2.4
+      get-symbol-description: 1.0.2
+      globalthis: 1.0.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+      has-proto: 1.0.3
+      has-symbols: 1.0.3
+      hasown: 2.0.2
+      internal-slot: 1.0.7
+      is-array-buffer: 3.0.4
+      is-callable: 1.2.7
+      is-data-view: 1.0.1
+      is-negative-zero: 2.0.3
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.3
+      is-string: 1.0.7
+      is-typed-array: 1.1.13
+      is-weakref: 1.0.2
+      object-inspect: 1.13.2
+      object-keys: 1.1.1
+      object.assign: 4.1.5
+      regexp.prototype.flags: 1.5.3
+      safe-array-concat: 1.1.2
+      safe-regex-test: 1.0.3
+      string.prototype.trim: 1.2.9
+      string.prototype.trimend: 1.0.8
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.2
+      typed-array-byte-length: 1.0.1
+      typed-array-byte-offset: 1.0.2
+      typed-array-length: 1.0.6
+      unbox-primitive: 1.0.2
+      which-typed-array: 1.1.15
+
   es-aggregate-error@1.0.12:
     dependencies:
       define-data-property: 1.1.4
@@ -20761,6 +19147,8 @@ snapshots:
       has-property-descriptors: 1.0.2
       set-function-name: 2.0.2
 
+  es-array-method-boxes-properly@1.0.0: {}
+
   es-define-property@1.0.0:
     dependencies:
       get-intrinsic: 1.2.4
@@ -20781,6 +19169,10 @@ snapshots:
 
   es-module-lexer@1.5.3: {}
 
+  es-object-atoms@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+
   es-set-tostringtag@2.0.1:
     dependencies:
       get-intrinsic: 1.2.4
@@ -20805,38 +19197,39 @@ snapshots:
 
   es6-promise@3.3.1: {}
 
-  esbuild-register@3.5.0(esbuild@0.20.2):
+  esbuild-register@3.5.0(esbuild@0.24.0):
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
-      esbuild: 0.20.2
+      debug: 4.3.7
+      esbuild: 0.24.0
     transitivePeerDependencies:
       - supports-color
 
-  esbuild@0.20.2:
+  esbuild@0.24.0:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.20.2
-      '@esbuild/android-arm': 0.20.2
-      '@esbuild/android-arm64': 0.20.2
-      '@esbuild/android-x64': 0.20.2
-      '@esbuild/darwin-arm64': 0.20.2
-      '@esbuild/darwin-x64': 0.20.2
-      '@esbuild/freebsd-arm64': 0.20.2
-      '@esbuild/freebsd-x64': 0.20.2
-      '@esbuild/linux-arm': 0.20.2
-      '@esbuild/linux-arm64': 0.20.2
-      '@esbuild/linux-ia32': 0.20.2
-      '@esbuild/linux-loong64': 0.20.2
-      '@esbuild/linux-mips64el': 0.20.2
-      '@esbuild/linux-ppc64': 0.20.2
-      '@esbuild/linux-riscv64': 0.20.2
-      '@esbuild/linux-s390x': 0.20.2
-      '@esbuild/linux-x64': 0.20.2
-      '@esbuild/netbsd-x64': 0.20.2
-      '@esbuild/openbsd-x64': 0.20.2
-      '@esbuild/sunos-x64': 0.20.2
-      '@esbuild/win32-arm64': 0.20.2
-      '@esbuild/win32-ia32': 0.20.2
-      '@esbuild/win32-x64': 0.20.2
+      '@esbuild/aix-ppc64': 0.24.0
+      '@esbuild/android-arm': 0.24.0
+      '@esbuild/android-arm64': 0.24.0
+      '@esbuild/android-x64': 0.24.0
+      '@esbuild/darwin-arm64': 0.24.0
+      '@esbuild/darwin-x64': 0.24.0
+      '@esbuild/freebsd-arm64': 0.24.0
+      '@esbuild/freebsd-x64': 0.24.0
+      '@esbuild/linux-arm': 0.24.0
+      '@esbuild/linux-arm64': 0.24.0
+      '@esbuild/linux-ia32': 0.24.0
+      '@esbuild/linux-loong64': 0.24.0
+      '@esbuild/linux-mips64el': 0.24.0
+      '@esbuild/linux-ppc64': 0.24.0
+      '@esbuild/linux-riscv64': 0.24.0
+      '@esbuild/linux-s390x': 0.24.0
+      '@esbuild/linux-x64': 0.24.0
+      '@esbuild/netbsd-x64': 0.24.0
+      '@esbuild/openbsd-arm64': 0.24.0
+      '@esbuild/openbsd-x64': 0.24.0
+      '@esbuild/sunos-x64': 0.24.0
+      '@esbuild/win32-arm64': 0.24.0
+      '@esbuild/win32-ia32': 0.24.0
+      '@esbuild/win32-x64': 0.24.0
 
   escalade@3.1.1: {}
 
@@ -20894,7 +19287,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:
@@ -20919,7 +19312,7 @@ snapshots:
 
   eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.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.6.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.6.2)
       eslint: 8.57.0
@@ -20939,7 +19332,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
@@ -21108,7 +19501,7 @@ snapshots:
 
   estree-walker@3.0.3:
     dependencies:
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
 
   esutils@2.0.3: {}
 
@@ -21130,6 +19523,8 @@ snapshots:
 
   eventemitter3@4.0.7: {}
 
+  eventemitter3@5.0.1: {}
+
   events@3.3.0: {}
 
   eventsource@2.0.2: {}
@@ -21189,32 +19584,32 @@ snapshots:
 
   expr-eval@2.0.2: {}
 
-  express-async-errors@3.1.1(express@4.21.0):
+  express-async-errors@3.1.1(express@4.21.1):
     dependencies:
-      express: 4.21.0
+      express: 4.21.1
 
   express-handlebars@7.1.2:
     dependencies:
-      glob: 10.3.10
+      glob: 10.4.5
       graceful-fs: 4.2.11
       handlebars: 4.7.8
 
-  express-openapi-validator@5.3.3(express@4.21.0):
+  express-openapi-validator@5.3.7(express@4.21.1):
     dependencies:
       '@apidevtools/json-schema-ref-parser': 11.7.0
-      '@types/multer': 1.4.11
+      '@types/multer': 1.4.12
       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.21.0
+      express: 4.21.1
       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.2
+      path-to-regexp: 8.2.0
 
   express-prom-bundle@6.6.0(prom-client@13.2.0):
     dependencies:
@@ -21222,18 +19617,18 @@ snapshots:
       prom-client: 13.2.0
       url-value-parser: 2.2.0
 
-  express-rate-limit@7.2.0(express@4.21.0):
+  express-rate-limit@7.2.0(express@4.21.1):
     dependencies:
-      express: 4.21.0
+      express: 4.21.1
 
-  express@4.21.0:
+  express@4.21.1:
     dependencies:
       accepts: 1.3.8
       array-flatten: 1.1.1
       body-parser: 1.20.3
       content-disposition: 0.5.4
       content-type: 1.0.5
-      cookie: 0.6.0
+      cookie: 0.7.1
       cookie-signature: 1.0.6
       debug: 2.6.9
       depd: 2.0.0
@@ -21286,15 +19681,13 @@ snapshots:
 
   fast-deep-equal@3.1.3: {}
 
-  fast-fifo@1.3.2: {}
-
   fast-glob@3.2.12:
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
-      micromatch: 4.0.5
+      micromatch: 4.0.8
 
   fast-glob@3.3.2:
     dependencies:
@@ -21302,7 +19695,7 @@ snapshots:
       '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
-      micromatch: 4.0.5
+      micromatch: 4.0.8
 
   fast-json-stable-stringify@2.1.0: {}
 
@@ -21319,14 +19712,6 @@ snapshots:
 
   fast-uri@3.0.1: {}
 
-  fast-xml-parser@4.2.5:
-    dependencies:
-      strnum: 1.0.5
-
-  fast-xml-parser@4.3.5:
-    dependencies:
-      strnum: 1.0.5
-
   fast-xml-parser@4.4.1:
     dependencies:
       strnum: 1.0.5
@@ -21383,7 +19768,7 @@ snapshots:
 
   filesize@10.1.0: {}
 
-  fill-range@7.0.1:
+  fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
 
@@ -21671,14 +20056,6 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob@10.3.10:
-    dependencies:
-      foreground-child: 3.1.1
-      jackspeak: 2.3.6
-      minimatch: 9.0.5
-      minipass: 7.0.2
-      path-scurry: 1.10.1
-
   glob@10.3.3:
     dependencies:
       foreground-child: 3.1.1
@@ -21734,6 +20111,11 @@ snapshots:
     dependencies:
       define-properties: 1.2.1
 
+  globalthis@1.0.4:
+    dependencies:
+      define-properties: 1.2.1
+      gopd: 1.0.1
+
   globby@11.1.0:
     dependencies:
       array-union: 2.1.0
@@ -21748,7 +20130,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
 
@@ -21877,6 +20259,8 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
+  has@1.0.4: {}
+
   hash-sum@2.0.0: {}
 
   hasown@2.0.0:
@@ -21922,6 +20306,11 @@ snapshots:
 
   hosted-git-info@2.8.9: {}
 
+  html-element-map@1.3.1:
+    dependencies:
+      array.prototype.filter: 1.0.4
+      call-bind: 1.0.7
+
   html-encoding-sniffer@3.0.0:
     dependencies:
       whatwg-encoding: 2.0.0
@@ -21995,7 +20384,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 1.1.2
       agent-base: 6.0.2
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -22004,14 +20393,14 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
   http-proxy-agent@7.0.0:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -22026,14 +20415,21 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
+    transitivePeerDependencies:
+      - supports-color
+
+  https-proxy-agent@7.0.5:
+    dependencies:
+      agent-base: 7.1.0
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -22100,7 +20496,7 @@ snapshots:
 
   infisical-node@1.3.0:
     dependencies:
-      axios: 1.7.4
+      axios: 1.7.7
       dotenv: 16.3.1
       tweetnacl: 1.0.3
       tweetnacl-util: 0.15.1
@@ -22205,10 +20601,6 @@ snapshots:
     dependencies:
       has-bigints: 1.0.2
 
-  is-binary-path@2.1.0:
-    dependencies:
-      binary-extensions: 2.2.0
-
   is-boolean-object@1.1.2:
     dependencies:
       call-bind: 1.0.7
@@ -22230,6 +20622,10 @@ snapshots:
     dependencies:
       hasown: 2.0.0
 
+  is-data-view@1.0.1:
+    dependencies:
+      is-typed-array: 1.1.13
+
   is-date-object@1.0.5:
     dependencies:
       has-tostringtag: 1.0.2
@@ -22313,6 +20709,8 @@ snapshots:
     dependencies:
       has-tostringtag: 1.0.2
 
+  is-subset@0.1.1: {}
+
   is-symbol@1.0.4:
     dependencies:
       has-symbols: 1.0.3
@@ -22383,16 +20781,11 @@ snapshots:
   istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
 
-  istanbul-reports@3.1.6:
-    dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.1
-
   istanbul-reports@3.1.7:
     dependencies:
       html-escaper: 2.0.2
@@ -22487,7 +20880,7 @@ snapshots:
       jest-runner: 29.6.2
       jest-util: 29.6.2
       jest-validate: 29.6.2
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       parse-json: 5.2.0
       pretty-format: 29.7.0
       slash: 3.0.0
@@ -22564,7 +20957,7 @@ snapshots:
       jest-regex-util: 29.4.3
       jest-util: 29.6.2
       jest-worker: 29.6.2
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.3
@@ -22595,7 +20988,7 @@ snapshots:
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.11
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       pretty-format: 29.7.0
       slash: 3.0.0
       stack-utils: 2.0.6
@@ -22607,7 +21000,7 @@ snapshots:
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.11
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       pretty-format: 29.7.0
       slash: 3.0.0
       stack-utils: 2.0.6
@@ -22708,7 +21101,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.6
+      '@babel/types': 7.25.6
       '@jest/expect-utils': 29.6.2
       '@jest/transform': 29.6.2
       '@jest/types': 29.6.1
@@ -22856,7 +21249,7 @@ snapshots:
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
       is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.2
+      nwsapi: 2.2.7
       parse5: 7.1.2
       saxes: 6.0.0
       symbol-tree: 3.2.4
@@ -23035,7 +21428,7 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  langchain@0.3.2(jteet444uhz3pk3ib4eb2yc7pm):
+  langchain@0.3.2(u4cmnaniapk3e37ytin75vjstm):
     dependencies:
       '@langchain/core': 0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
       '@langchain/openai': 0.3.0(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
@@ -23052,15 +21445,15 @@ snapshots:
       zod-to-json-schema: 3.23.3(zod@3.23.8)
     optionalDependencies:
       '@langchain/anthropic': 0.3.1(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/aws': 0.1.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@aws-sdk/client-sts@3.645.0)(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
-      '@langchain/cohere': 0.3.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/aws': 0.1.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
+      '@langchain/cohere': 0.3.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/google-genai': 0.1.0(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
       '@langchain/google-vertexai': 0.1.0(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
       '@langchain/groq': 0.1.2(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/mistralai': 0.1.1(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/ollama': 0.1.0(@langchain/core@0.3.3(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
-      axios: 1.7.7(debug@4.3.7)
-      cheerio: 1.0.0-rc.12
+      axios: 1.7.7
+      cheerio: 1.0.0
       handlebars: 4.7.8
     transitivePeerDependencies:
       - encoding
@@ -23078,11 +21471,29 @@ snapshots:
     optionalDependencies:
       openai: 4.63.0(encoding@0.1.13)(zod@3.23.8)
 
-  lazy-ass@1.6.0: {}
-
-  lazystream@1.0.1:
+  langsmith@0.1.59(openai@4.63.0(zod@3.23.8)):
     dependencies:
-      readable-stream: 2.3.7
+      '@types/uuid': 10.0.0
+      commander: 10.0.1
+      p-queue: 6.6.2
+      p-retry: 4.6.2
+      semver: 7.6.0
+      uuid: 10.0.0
+    optionalDependencies:
+      openai: 4.63.0(zod@3.23.8)
+
+  langsmith@0.1.59(openai@4.63.0):
+    dependencies:
+      '@types/uuid': 10.0.0
+      commander: 10.0.1
+      p-queue: 6.6.2
+      p-retry: 4.6.2
+      semver: 7.6.0
+      uuid: 10.0.0
+    optionalDependencies:
+      openai: 4.63.0(zod@3.23.8)
+
+  lazy-ass@1.6.0: {}
 
   ldapts@4.2.6:
     dependencies:
@@ -23239,6 +21650,10 @@ snapshots:
 
   lodash.defaults@4.2.0: {}
 
+  lodash.escape@4.0.1: {}
+
+  lodash.flattendeep@4.4.0: {}
+
   lodash.get@4.4.2: {}
 
   lodash.includes@4.3.0: {}
@@ -23281,9 +21696,10 @@ snapshots:
       slice-ansi: 4.0.0
       wrap-ansi: 6.2.0
 
-  logform@2.4.2:
+  logform@2.6.1:
     dependencies:
-      '@colors/colors': 1.5.0
+      '@colors/colors': 1.6.0
+      '@types/triple-beam': 1.3.5
       fecha: 4.2.3
       ms: 2.1.3
       safe-stable-stringify: 2.4.0
@@ -23340,6 +21756,8 @@ snapshots:
 
   luxon@3.4.4: {}
 
+  luxon@3.5.0: {}
+
   lz-string@1.5.0: {}
 
   magic-string@0.30.10:
@@ -23352,13 +21770,13 @@ snapshots:
 
   magic-string@0.30.8:
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/sourcemap-codec': 1.5.0
 
   magicast@0.3.5:
     dependencies:
       '@babel/parser': 7.25.6
       '@babel/types': 7.25.6
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
   mailparser@3.6.7:
     dependencies:
@@ -23486,9 +21904,9 @@ snapshots:
 
   methods@1.1.2: {}
 
-  micromatch@4.0.5:
+  micromatch@4.0.8:
     dependencies:
-      braces: 3.0.2
+      braces: 3.0.3
       picomatch: 2.3.1
 
   mime-db@1.52.0: {}
@@ -23584,8 +22002,6 @@ snapshots:
 
   minipass@5.0.0: {}
 
-  minipass@7.0.2: {}
-
   minipass@7.1.2: {}
 
   minizlib@2.1.2:
@@ -23635,8 +22051,8 @@ snapshots:
   mjml-cli@4.15.3(encoding@0.1.13):
     dependencies:
       '@babel/runtime': 7.24.7
-      chokidar: 3.5.2
-      glob: 10.3.10
+      chokidar: 4.0.1
+      glob: 10.4.5
       html-minifier: 4.0.0
       js-beautify: 1.14.9
       lodash: 4.17.21
@@ -23921,17 +22337,18 @@ snapshots:
       pkg-types: 1.1.3
       ufo: 1.5.4
 
-  mobx-react-lite@3.4.3(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  mobx-react-lite@4.0.7(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       mobx: 6.12.0
       react: 18.2.0
+      use-sync-external-store: 1.2.2(react@18.2.0)
     optionalDependencies:
       react-dom: 18.2.0(react@18.2.0)
 
-  mobx-react@7.6.0(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  mobx-react@9.1.1(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       mobx: 6.12.0
-      mobx-react-lite: 3.4.3(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      mobx-react-lite: 4.0.7(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
     optionalDependencies:
       react-dom: 18.2.0(react@18.2.0)
@@ -23949,20 +22366,22 @@ snapshots:
       '@types/whatwg-url': 11.0.4
       whatwg-url: 13.0.0
 
-  mongodb@6.3.0(@aws-sdk/credential-providers@3.645.0)(gcp-metadata@5.3.0(encoding@0.1.13))(socks@2.7.1):
+  mongodb@6.3.0(@aws-sdk/credential-providers@3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0)))(gcp-metadata@5.3.0(encoding@0.1.13))(socks@2.7.1):
     dependencies:
-      '@mongodb-js/saslprep': 1.1.0
-      bson: 6.3.0
+      '@mongodb-js/saslprep': 1.1.9
+      bson: 6.8.0
       mongodb-connection-string-url: 3.0.0
     optionalDependencies:
-      '@aws-sdk/credential-providers': 3.645.0(@aws-sdk/client-sso-oidc@3.654.0(@aws-sdk/client-sts@3.654.0))
+      '@aws-sdk/credential-providers': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))
       gcp-metadata: 5.3.0(encoding@0.1.13)
       socks: 2.7.1
 
+  moo@0.5.2: {}
+
   mqtt-packet@9.0.0:
     dependencies:
       bl: 6.0.12
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       process-nextick-args: 2.0.1
     transitivePeerDependencies:
       - supports-color
@@ -23970,7 +22389,7 @@ snapshots:
   mqtt@5.7.2:
     dependencies:
       '@types/readable-stream': 4.0.10
-      '@types/ws': 8.5.10
+      '@types/ws': 8.5.12
       commist: 3.2.0
       concat-stream: 2.0.0
       debug: 4.3.4
@@ -24023,8 +22442,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  muggle-string@0.3.1: {}
-
   muggle-string@0.4.1: {}
 
   multer@1.4.5-lts.1:
@@ -24080,6 +22497,13 @@ snapshots:
 
   natural-compare@1.4.0: {}
 
+  nearley@2.20.1:
+    dependencies:
+      commander: 2.20.3
+      moo: 0.5.2
+      railroad-diagrams: 1.0.0
+      randexp: 0.4.6
+
   negotiator@0.6.3: {}
 
   neo-async@2.6.2: {}
@@ -24190,7 +22614,7 @@ snapshots:
 
   nodemon@3.0.1:
     dependencies:
-      chokidar: 3.5.2
+      chokidar: 4.0.1
       debug: 3.2.7(supports-color@5.5.0)
       ignore-by-default: 1.0.1
       minimatch: 3.1.2
@@ -24247,20 +22671,18 @@ snapshots:
 
   number-allocator@1.0.14:
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       js-sdsl: 4.3.0
     transitivePeerDependencies:
       - supports-color
 
-  nunjucks@3.2.4(chokidar@3.5.2):
+  nunjucks@3.2.4(chokidar@4.0.1):
     dependencies:
       a-sync-waterfall: 1.0.1
       asap: 2.0.6
       commander: 5.1.0
     optionalDependencies:
-      chokidar: 3.5.2
-
-  nwsapi@2.2.2: {}
+      chokidar: 4.0.1
 
   nwsapi@2.2.7: {}
 
@@ -24303,11 +22725,18 @@ snapshots:
 
   object-inspect@1.13.1: {}
 
+  object-inspect@1.13.2: {}
+
   object-is@1.1.5:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.0
 
+  object-is@1.1.6:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+
   object-keys@1.1.1: {}
 
   object.assign@4.1.5:
@@ -24323,6 +22752,12 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.22.5
 
+  object.entries@1.1.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
   object.fromentries@2.0.7:
     dependencies:
       call-bind: 1.0.7
@@ -24342,6 +22777,12 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.22.5
 
+  object.values@1.2.0:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
   obuf@1.1.2: {}
 
   ollama@0.5.6:
@@ -24396,13 +22837,27 @@ snapshots:
       - encoding
       - supports-color
 
-  openapi-sampler@1.4.0:
+  openai@4.63.0(zod@3.23.8):
+    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)
+    optionalDependencies:
+      zod: 3.23.8
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    optional: true
+
+  openapi-sampler@1.5.1:
     dependencies:
       '@types/json-schema': 7.0.15
       json-pointer: 0.6.2
 
-  openapi-types@10.0.0: {}
-
   openapi-types@12.1.3: {}
 
   option@0.2.4: {}
@@ -24520,6 +22975,10 @@ snapshots:
       domhandler: 5.0.3
       parse5: 7.1.2
 
+  parse5-parser-stream@7.1.2:
+    dependencies:
+      parse5: 7.1.2
+
   parse5@6.0.1: {}
 
   parse5@7.1.2:
@@ -24553,11 +23012,6 @@ snapshots:
 
   path-parse@1.0.7: {}
 
-  path-scurry@1.10.1:
-    dependencies:
-      lru-cache: 10.2.2
-      minipass: 7.1.2
-
   path-scurry@1.11.1:
     dependencies:
       lru-cache: 10.2.2
@@ -24565,7 +23019,7 @@ snapshots:
 
   path-to-regexp@0.1.10: {}
 
-  path-to-regexp@6.2.2: {}
+  path-to-regexp@8.2.0: {}
 
   path-type@4.0.0: {}
 
@@ -24579,7 +23033,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
@@ -24665,11 +23119,11 @@ snapshots:
 
   pify@2.3.0: {}
 
-  pinia@2.1.6(typescript@5.6.2)(vue@3.4.21(typescript@5.6.2)):
+  pinia@2.2.4(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)):
     dependencies:
-      '@vue/devtools-api': 6.5.0
-      vue: 3.4.21(typescript@5.6.2)
-      vue-demi: 0.14.5(vue@3.4.21(typescript@5.6.2))
+      '@vue/devtools-api': 6.6.4
+      vue: 3.5.11(typescript@5.6.2)
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
     optionalDependencies:
       typescript: 5.6.2
 
@@ -24743,7 +23197,7 @@ snapshots:
     dependencies:
       nanoid: 3.3.7
       picocolors: 1.0.1
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
   postcss@8.4.38:
     dependencies:
@@ -24781,7 +23235,7 @@ snapshots:
 
   posthog-node@3.2.1:
     dependencies:
-      axios: 1.7.4
+      axios: 1.7.7
       rusha: 0.8.14
     transitivePeerDependencies:
       - debug
@@ -25009,9 +23463,9 @@ snapshots:
     dependencies:
       long: 4.0.0
 
-  qrcode.vue@3.3.4(vue@3.4.21(typescript@5.6.2)):
+  qrcode.vue@3.3.4(vue@3.5.11(typescript@5.6.2)):
     dependencies:
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
   qs@6.10.4:
     dependencies:
@@ -25042,12 +23496,21 @@ snapshots:
 
   queue-microtask@1.2.3: {}
 
-  queue-tick@1.0.1: {}
-
   quoted-printable@1.0.1:
     dependencies:
       utf8: 2.1.2
 
+  raf@3.4.1:
+    dependencies:
+      performance-now: 2.1.0
+
+  railroad-diagrams@1.0.0: {}
+
+  randexp@0.4.6:
+    dependencies:
+      discontinuous-range: 1.0.0
+      ret: 0.1.15
+
   random-bytes@1.0.0: {}
 
   randombytes@2.1.0:
@@ -25099,9 +23562,15 @@ snapshots:
 
   react-is@18.2.0: {}
 
-  react-tabs@4.3.0(react@18.2.0):
+  react-shallow-renderer@16.15.0(react@18.2.0):
     dependencies:
-      clsx: 1.2.1
+      object-assign: 4.1.1
+      react: 18.2.0
+      react-is: 18.2.0
+
+  react-tabs@6.0.2(react@18.2.0):
+    dependencies:
+      clsx: 2.1.1
       prop-types: 15.8.1
       react: 18.2.0
 
@@ -25169,13 +23638,7 @@ snapshots:
     dependencies:
       readable-stream: 3.6.0
 
-  readdir-glob@1.1.3:
-    dependencies:
-      minimatch: 5.1.5
-
-  readdirp@3.6.0:
-    dependencies:
-      picomatch: 2.3.1
+  readdirp@4.0.2: {}
 
   readline-sync@1.4.10: {}
 
@@ -25235,21 +23698,22 @@ snapshots:
       '@redis/search': 1.1.6(@redis/client@1.5.16)
       '@redis/time-series': 1.0.5(@redis/client@1.5.16)
 
-  redoc@2.1.3(core-js@3.35.0)(encoding@0.1.13)(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(styled-components@6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)):
+  redoc@2.1.5(core-js@3.35.0)(encoding@0.1.13)(enzyme@3.11.0)(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(styled-components@6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)):
     dependencies:
-      '@redocly/openapi-core': 1.6.0(encoding@0.1.13)
+      '@cfaester/enzyme-adapter-react-18': 0.8.0(enzyme@3.11.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@redocly/openapi-core': 1.25.5(encoding@0.1.13)
       classnames: 2.5.1
       core-js: 3.35.0
       decko: 1.2.0
-      dompurify: 2.4.7
-      eventemitter3: 4.0.7
+      dompurify: 3.1.7
+      eventemitter3: 5.0.1
       json-pointer: 0.6.2
       lunr: 2.3.9
       mark.js: 8.11.1
       marked: 4.3.0
       mobx: 6.12.0
-      mobx-react: 7.6.0(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      openapi-sampler: 1.4.0
+      mobx-react: 9.1.1(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      openapi-sampler: 1.5.1
       path-browserify: 1.0.1
       perfect-scrollbar: 1.5.5
       polished: 4.2.2
@@ -25257,7 +23721,7 @@ snapshots:
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-tabs: 4.3.0(react@18.2.0)
+      react-tabs: 6.0.2(react@18.2.0)
       slugify: 1.4.7
       stickyfill: 1.1.1
       styled-components: 6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -25265,7 +23729,9 @@ snapshots:
       url-template: 2.0.8
     transitivePeerDependencies:
       - encoding
+      - enzyme
       - react-native
+      - supports-color
 
   reflect-metadata@0.2.2: {}
 
@@ -25288,6 +23754,13 @@ snapshots:
       es-errors: 1.3.0
       set-function-name: 2.0.2
 
+  regexp.prototype.flags@1.5.3:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      set-function-name: 2.0.2
+
   regjsparser@0.10.0:
     dependencies:
       jsesc: 0.5.0
@@ -25347,11 +23820,6 @@ snapshots:
 
   resolve.exports@2.0.0: {}
 
-  resolve@1.19.0:
-    dependencies:
-      is-core-module: 2.13.1
-      path-parse: 1.0.7
-
   resolve@1.22.3:
     dependencies:
       is-core-module: 2.13.1
@@ -25369,6 +23837,8 @@ snapshots:
       onetime: 5.1.2
       signal-exit: 3.0.7
 
+  ret@0.1.15: {}
+
   retry-request@7.0.2(encoding@0.1.13):
     dependencies:
       '@types/request': 2.48.12
@@ -25392,7 +23862,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
 
@@ -25410,26 +23880,26 @@ snapshots:
 
   rndm@1.2.0: {}
 
-  rollup@4.22.2:
+  rollup@4.24.0:
     dependencies:
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.22.2
-      '@rollup/rollup-android-arm64': 4.22.2
-      '@rollup/rollup-darwin-arm64': 4.22.2
-      '@rollup/rollup-darwin-x64': 4.22.2
-      '@rollup/rollup-linux-arm-gnueabihf': 4.22.2
-      '@rollup/rollup-linux-arm-musleabihf': 4.22.2
-      '@rollup/rollup-linux-arm64-gnu': 4.22.2
-      '@rollup/rollup-linux-arm64-musl': 4.22.2
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.22.2
-      '@rollup/rollup-linux-riscv64-gnu': 4.22.2
-      '@rollup/rollup-linux-s390x-gnu': 4.22.2
-      '@rollup/rollup-linux-x64-gnu': 4.22.2
-      '@rollup/rollup-linux-x64-musl': 4.22.2
-      '@rollup/rollup-win32-arm64-msvc': 4.22.2
-      '@rollup/rollup-win32-ia32-msvc': 4.22.2
-      '@rollup/rollup-win32-x64-msvc': 4.22.2
+      '@rollup/rollup-android-arm-eabi': 4.24.0
+      '@rollup/rollup-android-arm64': 4.24.0
+      '@rollup/rollup-darwin-arm64': 4.24.0
+      '@rollup/rollup-darwin-x64': 4.24.0
+      '@rollup/rollup-linux-arm-gnueabihf': 4.24.0
+      '@rollup/rollup-linux-arm-musleabihf': 4.24.0
+      '@rollup/rollup-linux-arm64-gnu': 4.24.0
+      '@rollup/rollup-linux-arm64-musl': 4.24.0
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.24.0
+      '@rollup/rollup-linux-riscv64-gnu': 4.24.0
+      '@rollup/rollup-linux-s390x-gnu': 4.24.0
+      '@rollup/rollup-linux-x64-gnu': 4.24.0
+      '@rollup/rollup-linux-x64-musl': 4.24.0
+      '@rollup/rollup-win32-arm64-msvc': 4.24.0
+      '@rollup/rollup-win32-ia32-msvc': 4.24.0
+      '@rollup/rollup-win32-x64-msvc': 4.24.0
       fsevents: 2.3.3
 
   route-recognizer@0.3.4: {}
@@ -25445,6 +23915,11 @@ snapshots:
       entities: 2.2.0
       xml2js: 0.5.0
 
+  rst-selector-parser@2.2.3:
+    dependencies:
+      lodash.flattendeep: 4.4.0
+      nearley: 2.20.1
+
   run-async@2.4.1: {}
 
   run-parallel@1.2.0:
@@ -25523,7 +23998,7 @@ snapshots:
 
   sass@1.64.1:
     dependencies:
-      chokidar: 3.5.2
+      chokidar: 4.0.1
       immutable: 4.2.2
       source-map-js: 1.0.2
 
@@ -25715,7 +24190,7 @@ snapshots:
 
   simple-websocket@9.1.0:
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       queue-microtask: 1.2.3
       randombytes: 2.1.0
       readable-stream: 3.6.0
@@ -25755,7 +24230,7 @@ snapshots:
 
   snowflake-sdk@1.12.0(asn1.js@5.4.1)(encoding@0.1.13):
     dependencies:
-      '@aws-sdk/client-s3': 3.478.0
+      '@aws-sdk/client-s3': 3.666.0
       '@aws-sdk/node-http-handler': 3.374.0
       '@azure/storage-blob': 12.18.0(encoding@0.1.13)
       '@google-cloud/storage': 7.12.1(encoding@0.1.13)
@@ -25763,17 +24238,17 @@ 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.7.4
+      axios: 1.7.7
       big-integer: 1.6.51
       bignumber.js: 9.1.2
       binascii: 0.0.2
       bn.js: 5.2.1
       browser-request: 0.3.3
       expand-tilde: 2.0.2
-      fast-xml-parser: 4.3.5
+      fast-xml-parser: 4.4.1
       fastest-levenshtein: 1.0.16
       generic-pool: 3.9.0
-      glob: 10.3.10
+      glob: 10.4.5
       https-proxy-agent: 7.0.2
       jsonwebtoken: 9.0.2
       mime-types: 2.1.35
@@ -25785,7 +24260,7 @@ snapshots:
       simple-lru-cache: 0.0.2
       toml: 3.0.0
       uuid: 8.3.2
-      winston: 3.8.2
+      winston: 3.14.2
     transitivePeerDependencies:
       - aws-crt
       - debug
@@ -25795,7 +24270,7 @@ snapshots:
   socks-proxy-agent@6.2.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -25875,8 +24350,6 @@ snapshots:
 
   sqlstring@2.3.3: {}
 
-  sse-channel@4.0.0: {}
-
   ssh2-sftp-client@7.2.3:
     dependencies:
       concat-stream: 2.0.0
@@ -25947,9 +24420,9 @@ snapshots:
 
   stoppable@1.1.0: {}
 
-  storybook@8.3.1:
+  storybook@8.3.5:
     dependencies:
-      '@storybook/core': 8.3.1
+      '@storybook/core': 8.3.5
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -25974,14 +24447,6 @@ snapshots:
 
   streamsearch@1.1.0: {}
 
-  streamx@2.20.1:
-    dependencies:
-      fast-fifo: 1.3.2
-      queue-tick: 1.0.1
-      text-decoder: 1.2.0
-    optionalDependencies:
-      bare-events: 2.5.0
-
   strict-event-emitter-types@2.0.0: {}
 
   strict-uri-encode@2.0.0: {}
@@ -26022,6 +24487,13 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.22.5
 
+  string.prototype.trim@1.2.9:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-abstract: 1.23.3
+      es-object-atoms: 1.0.0
+
   string.prototype.trimend@1.0.6:
     dependencies:
       call-bind: 1.0.7
@@ -26034,6 +24506,12 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.22.5
 
+  string.prototype.trimend@1.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
   string.prototype.trimstart@1.0.6:
     dependencies:
       call-bind: 1.0.7
@@ -26046,6 +24524,12 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.22.5
 
+  string.prototype.trimstart@1.0.8:
+    dependencies:
+      call-bind: 1.0.7
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+
   string_decoder@0.10.31: {}
 
   string_decoder@1.1.1:
@@ -26119,7 +24603,7 @@ snapshots:
     dependencies:
       component-emitter: 1.3.0
       cookiejar: 2.1.4
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       fast-safe-stringify: 2.1.1
       form-data: 4.0.0
       formidable: 3.5.1
@@ -26152,9 +24636,9 @@ snapshots:
 
   swagger-ui-dist@5.11.0: {}
 
-  swagger-ui-express@5.0.0(express@4.21.0):
+  swagger-ui-express@5.0.1(express@4.21.1):
     dependencies:
-      express: 4.21.0
+      express: 4.21.1
       swagger-ui-dist: 5.11.0
 
   swagger2openapi@7.0.8(encoding@0.1.13):
@@ -26181,7 +24665,7 @@ snapshots:
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
-      chokidar: 3.5.2
+      chokidar: 4.0.1
       didyoumean: 1.2.2
       dlv: 1.1.3
       fast-glob: 3.3.2
@@ -26189,7 +24673,7 @@ snapshots:
       is-glob: 4.0.3
       jiti: 1.21.0
       lilconfig: 2.1.0
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.0.1
@@ -26221,12 +24705,6 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.0
 
-  tar-stream@3.1.7:
-    dependencies:
-      b4a: 1.6.7
-      fast-fifo: 1.3.2
-      streamx: 2.20.1
-
   tar@6.2.1:
     dependencies:
       chownr: 2.0.0
@@ -26280,7 +24758,7 @@ snapshots:
 
   terser@5.16.1:
     dependencies:
-      '@jridgewell/source-map': 0.3.2
+      '@jridgewell/source-map': 0.3.6
       acorn: 8.12.1
       commander: 2.20.3
       source-map-support: 0.5.21
@@ -26298,10 +24776,6 @@ snapshots:
       glob: 10.4.5
       minimatch: 9.0.5
 
-  text-decoder@1.2.0:
-    dependencies:
-      b4a: 1.6.7
-
   text-hex@1.0.0: {}
 
   text-table@0.2.0: {}
@@ -26404,8 +24878,6 @@ snapshots:
     dependencies:
       yargs: 17.7.2
 
-  traverse@0.3.9: {}
-
   tree-kill@1.2.2: {}
 
   triple-beam@1.3.0: {}
@@ -26461,7 +24933,7 @@ snapshots:
       '@tsconfig/node16': 1.0.4
       '@types/node': 18.16.16
       acorn: 8.12.1
-      acorn-walk: 8.3.2
+      acorn-walk: 8.3.4
       arg: 4.1.3
       create-require: 1.1.1
       diff: 4.0.2
@@ -26482,7 +24954,7 @@ snapshots:
 
   tsc-alias@1.8.7:
     dependencies:
-      chokidar: 3.5.2
+      chokidar: 4.0.1
       commander: 9.4.1
       globby: 11.1.0
       mylas: 2.1.13
@@ -26513,32 +24985,32 @@ snapshots:
 
   tunnel@0.0.6: {}
 
-  turbo-darwin-64@2.0.6:
+  turbo-darwin-64@2.1.2:
     optional: true
 
-  turbo-darwin-arm64@2.0.6:
+  turbo-darwin-arm64@2.1.2:
     optional: true
 
-  turbo-linux-64@2.0.6:
+  turbo-linux-64@2.1.2:
     optional: true
 
-  turbo-linux-arm64@2.0.6:
+  turbo-linux-arm64@2.1.2:
     optional: true
 
-  turbo-windows-64@2.0.6:
+  turbo-windows-64@2.1.2:
     optional: true
 
-  turbo-windows-arm64@2.0.6:
+  turbo-windows-arm64@2.1.2:
     optional: true
 
-  turbo@2.0.6:
+  turbo@2.1.2:
     optionalDependencies:
-      turbo-darwin-64: 2.0.6
-      turbo-darwin-arm64: 2.0.6
-      turbo-linux-64: 2.0.6
-      turbo-linux-arm64: 2.0.6
-      turbo-windows-64: 2.0.6
-      turbo-windows-arm64: 2.0.6
+      turbo-darwin-64: 2.1.2
+      turbo-darwin-arm64: 2.1.2
+      turbo-linux-64: 2.1.2
+      turbo-linux-arm64: 2.1.2
+      turbo-windows-64: 2.1.2
+      turbo-windows-arm64: 2.1.2
 
   tween-functions@1.2.0: {}
 
@@ -26636,6 +25108,15 @@ snapshots:
       is-typed-array: 1.1.13
       possible-typed-array-names: 1.0.0
 
+  typed-array-length@1.0.6:
+    dependencies:
+      call-bind: 1.0.7
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.0.3
+      is-typed-array: 1.1.13
+      possible-typed-array-names: 1.0.0
+
   typedarray-dts@1.0.0: {}
 
   typedarray@0.0.6: {}
@@ -26710,7 +25191,7 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin-icons@0.19.0(@vue/compiler-sfc@3.4.21)(vue-template-compiler@2.7.14):
+  unplugin-icons@0.19.0(@vue/compiler-sfc@3.5.11):
     dependencies:
       '@antfu/install-pkg': 0.3.3
       '@antfu/utils': 0.7.10
@@ -26720,16 +25201,15 @@ snapshots:
       local-pkg: 0.5.0
       unplugin: 1.11.0
     optionalDependencies:
-      '@vue/compiler-sfc': 3.4.21
-      vue-template-compiler: 2.7.14
+      '@vue/compiler-sfc': 3.5.11
     transitivePeerDependencies:
       - supports-color
 
-  unplugin-vue-components@0.27.3(@babel/parser@7.25.6)(rollup@4.22.2)(vue@3.4.21(typescript@5.6.2)):
+  unplugin-vue-components@0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.11(typescript@5.6.2)):
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.2)
-      chokidar: 3.5.2
+      '@rollup/pluginutils': 5.1.0(rollup@4.24.0)
+      chokidar: 4.0.1
       debug: 4.3.5
       fast-glob: 3.3.2
       local-pkg: 0.5.0
@@ -26737,7 +25217,7 @@ snapshots:
       minimatch: 9.0.5
       mlly: 1.7.1
       unplugin: 1.11.0
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
     optionalDependencies:
       '@babel/parser': 7.25.6
     transitivePeerDependencies:
@@ -26747,24 +25227,19 @@ snapshots:
   unplugin@1.0.1:
     dependencies:
       acorn: 8.12.1
-      chokidar: 3.5.2
+      chokidar: 4.0.1
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
 
   unplugin@1.11.0:
     dependencies:
       acorn: 8.12.1
-      chokidar: 3.5.2
+      chokidar: 4.0.1
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.6.1
 
   untildify@4.0.0: {}
 
-  unzip-stream@0.3.4:
-    dependencies:
-      binary: 0.3.0
-      mkdirp: 0.5.6
-
   update-browserslist-db@1.0.13(browserslist@4.23.0):
     dependencies:
       browserslist: 4.23.0
@@ -26781,6 +25256,8 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
+  uri-js-replace@1.0.1: {}
+
   uri-js@4.4.1:
     dependencies:
       punycode: 2.3.1
@@ -26796,6 +25273,10 @@ snapshots:
 
   url-value-parser@2.2.0: {}
 
+  use-sync-external-store@1.2.2(react@18.2.0):
+    dependencies:
+      react: 18.2.0
+
   utf7@1.0.2:
     dependencies:
       semver: 7.6.0
@@ -26852,12 +25333,12 @@ snapshots:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
-  vite-node@2.1.1(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
+  vite-node@2.1.2(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       pathe: 1.1.2
-      vite: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -26869,51 +25350,53 @@ snapshots:
       - supports-color
       - terser
 
-  vite-plugin-dts@3.9.1(@types/node@18.16.16)(rollup@4.22.2)(typescript@5.6.2)(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)):
+  vite-plugin-dts@4.2.3(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.6.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)):
     dependencies:
-      '@microsoft/api-extractor': 7.43.0(@types/node@18.16.16)
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.2)
-      '@vue/language-core': 1.8.27(typescript@5.6.2)
-      debug: 4.3.5
+      '@microsoft/api-extractor': 7.47.7(@types/node@18.16.16)
+      '@rollup/pluginutils': 5.1.0(rollup@4.24.0)
+      '@volar/typescript': 2.4.6
+      '@vue/language-core': 2.1.6(typescript@5.6.2)
+      compare-versions: 6.1.1
+      debug: 4.3.7
       kolorist: 1.8.0
-      magic-string: 0.30.8
+      local-pkg: 0.5.0
+      magic-string: 0.30.11
       typescript: 5.6.2
-      vue-tsc: 1.8.27(typescript@5.6.2)
     optionalDependencies:
-      vite: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - '@types/node'
       - rollup
       - supports-color
 
-  vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
+  vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
     dependencies:
-      esbuild: 0.20.2
+      esbuild: 0.24.0
       postcss: 8.4.47
-      rollup: 4.22.2
+      rollup: 4.24.0
     optionalDependencies:
       '@types/node': 18.16.16
       fsevents: 2.3.3
       sass: 1.64.1
       terser: 5.16.1
 
-  vitest-mock-extended@2.0.2(typescript@5.6.2)(vitest@2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)):
+  vitest-mock-extended@2.0.2(typescript@5.6.2)(vitest@2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)):
     dependencies:
       ts-essentials: 10.0.2(typescript@5.6.2)
       typescript: 5.6.2
-      vitest: 2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vitest: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
 
-  vitest@2.1.1(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1):
+  vitest@2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1):
     dependencies:
-      '@vitest/expect': 2.1.1
-      '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
-      '@vitest/pretty-format': 2.1.1
-      '@vitest/runner': 2.1.1
-      '@vitest/snapshot': 2.1.1
-      '@vitest/spy': 2.1.1
-      '@vitest/utils': 2.1.1
+      '@vitest/expect': 2.1.2
+      '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
+      '@vitest/pretty-format': 2.1.2
+      '@vitest/runner': 2.1.2
+      '@vitest/snapshot': 2.1.2
+      '@vitest/spy': 2.1.2
+      '@vitest/utils': 2.1.2
       chai: 5.1.1
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7
       magic-string: 0.30.11
       pathe: 1.1.2
       std-env: 3.7.0
@@ -26921,8 +25404,8 @@ snapshots:
       tinyexec: 0.3.0
       tinypool: 1.0.1
       tinyrainbow: 1.2.0
-      vite: 5.4.6(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
-      vite-node: 2.1.1(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite-node: 2.1.2(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 18.16.16
@@ -26940,49 +25423,43 @@ snapshots:
 
   void-elements@3.1.0: {}
 
+  vscode-uri@3.0.8: {}
+
   vue-agile@2.0.0:
     dependencies:
       lodash.orderby: 4.6.0
       lodash.throttle: 4.1.1
 
-  vue-boring-avatars@1.3.0(vue@3.4.21(typescript@5.6.2)):
+  vue-boring-avatars@1.3.0(vue@3.5.11(typescript@5.6.2)):
     dependencies:
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  vue-chartjs@5.2.0(chart.js@4.4.0)(vue@3.4.21(typescript@5.6.2)):
+  vue-chartjs@5.2.0(chart.js@4.4.0)(vue@3.5.11(typescript@5.6.2)):
     dependencies:
       chart.js: 4.4.0
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  vue-component-meta@2.0.19(typescript@5.6.2):
+  vue-component-meta@2.1.6(typescript@5.6.2):
     dependencies:
-      '@volar/typescript': 2.2.5
-      '@vue/language-core': 2.0.19(typescript@5.6.2)
+      '@volar/typescript': 2.4.6
+      '@vue/language-core': 2.1.6(typescript@5.6.2)
       path-browserify: 1.0.1
-      vue-component-type-helpers: 2.0.19
+      vue-component-type-helpers: 2.1.6
     optionalDependencies:
       typescript: 5.6.2
 
-  vue-component-type-helpers@1.8.25: {}
-
-  vue-component-type-helpers@2.0.19: {}
-
   vue-component-type-helpers@2.1.6: {}
 
-  vue-demi@0.14.5(vue@3.4.21(typescript@5.6.2)):
+  vue-demi@0.14.10(vue@3.5.11(typescript@5.6.2)):
     dependencies:
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  vue-demi@0.14.8(vue@3.4.21(typescript@5.6.2)):
+  vue-docgen-api@4.76.0(vue@3.5.11(typescript@5.6.2)):
     dependencies:
-      vue: 3.4.21(typescript@5.6.2)
-
-  vue-docgen-api@4.76.0(vue@3.4.21(typescript@5.6.2)):
-    dependencies:
-      '@babel/parser': 7.24.6
-      '@babel/types': 7.24.6
-      '@vue/compiler-dom': 3.4.21
-      '@vue/compiler-sfc': 3.4.21
+      '@babel/parser': 7.25.6
+      '@babel/types': 7.25.6
+      '@vue/compiler-dom': 3.5.11
+      '@vue/compiler-sfc': 3.5.11
       ast-types: 0.16.1
       esm-resolve: 1.0.8
       hash-sum: 2.0.0
@@ -26990,8 +25467,8 @@ snapshots:
       pug: 3.0.3
       recast: 0.23.6
       ts-map: 1.0.3
-      vue: 3.4.21(typescript@5.6.2)
-      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.4.21(typescript@5.6.2))
+      vue: 3.5.11(typescript@5.6.2)
+      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.5.11(typescript@5.6.2))
 
   vue-eslint-parser@9.4.2(eslint@8.57.0):
     dependencies:
@@ -27006,60 +25483,48 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-i18n@9.2.2(vue@3.4.21(typescript@5.6.2)):
+  vue-i18n@9.2.2(vue@3.5.11(typescript@5.6.2)):
     dependencies:
       '@intlify/core-base': 9.2.2
       '@intlify/shared': 9.2.2
       '@intlify/vue-devtools': 9.2.2
       '@vue/devtools-api': 6.4.5
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.4.21(typescript@5.6.2)):
+  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.5.11(typescript@5.6.2)):
     dependencies:
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  vue-json-pretty@2.2.4(vue@3.4.21(typescript@5.6.2)):
+  vue-json-pretty@2.2.4(vue@3.5.11(typescript@5.6.2)):
     dependencies:
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  vue-markdown-render@2.2.1(vue@3.4.21(typescript@5.6.2)):
+  vue-markdown-render@2.2.1(vue@3.5.11(typescript@5.6.2)):
     dependencies:
       markdown-it: 13.0.2
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  vue-router@4.4.2(vue@3.4.21(typescript@5.6.2)):
+  vue-router@4.4.5(vue@3.5.11(typescript@5.6.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.4.21(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.6.2)
 
-  vue-template-compiler@2.7.14:
+  vue-tsc@2.1.6(typescript@5.6.2):
     dependencies:
-      de-indent: 1.0.2
-      he: 1.2.0
-
-  vue-tsc@1.8.27(typescript@5.6.2):
-    dependencies:
-      '@volar/typescript': 1.11.1
-      '@vue/language-core': 1.8.27(typescript@5.6.2)
-      semver: 7.6.0
-      typescript: 5.6.2
-
-  vue-tsc@2.0.19(typescript@5.6.2):
-    dependencies:
-      '@volar/typescript': 2.2.5
-      '@vue/language-core': 2.0.19(typescript@5.6.2)
+      '@volar/typescript': 2.4.6
+      '@vue/language-core': 2.1.6(typescript@5.6.2)
       semver: 7.6.0
       typescript: 5.6.2
 
   vue3-touch-events@4.1.3: {}
 
-  vue@3.4.21(typescript@5.6.2):
+  vue@3.5.11(typescript@5.6.2):
     dependencies:
-      '@vue/compiler-dom': 3.4.21
-      '@vue/compiler-sfc': 3.4.21
-      '@vue/runtime-dom': 3.4.21
-      '@vue/server-renderer': 3.4.21(vue@3.4.21(typescript@5.6.2))
-      '@vue/shared': 3.4.21
+      '@vue/compiler-dom': 3.5.11
+      '@vue/compiler-sfc': 3.5.11
+      '@vue/runtime-dom': 3.5.11
+      '@vue/server-renderer': 3.5.11(vue@3.5.11(typescript@5.6.2))
+      '@vue/shared': 3.5.11
     optionalDependencies:
       typescript: 5.6.2
 
@@ -27191,25 +25656,25 @@ snapshots:
     dependencies:
       string-width: 4.2.3
 
-  winston-transport@4.5.0:
+  winston-transport@4.8.0:
     dependencies:
-      logform: 2.4.2
-      readable-stream: 3.6.0
+      logform: 2.6.1
+      readable-stream: 4.5.2
       triple-beam: 1.3.0
 
-  winston@3.8.2:
+  winston@3.14.2:
     dependencies:
-      '@colors/colors': 1.5.0
+      '@colors/colors': 1.6.0
       '@dabh/diagnostics': 2.0.3
       async: 3.2.4
       is-stream: 2.0.1
-      logform: 2.4.2
+      logform: 2.6.1
       one-time: 1.0.0
       readable-stream: 3.6.0
       safe-stable-stringify: 2.4.0
       stack-trace: 0.0.10
       triple-beam: 1.3.0
-      winston-transport: 4.5.0
+      winston-transport: 4.8.0
 
   with@7.0.2:
     dependencies:
@@ -27393,20 +25858,6 @@ snapshots:
       property-expr: 2.0.5
       toposort: 2.0.2
 
-  z-schema@5.0.5:
-    dependencies:
-      lodash.get: 4.4.2
-      lodash.isequal: 4.5.0
-      validator: 13.7.0
-    optionalDependencies:
-      commander: 9.4.1
-
-  zip-stream@6.0.1:
-    dependencies:
-      archiver-utils: 5.0.2
-      compress-commons: 6.0.2
-      readable-stream: 4.5.2
-
   zod-class@0.0.15(zod@3.23.8):
     dependencies:
       type-fest: 4.26.1
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 4647c29147..055a466738 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -12,6 +12,7 @@ catalog:
   '@types/xml2js': ^0.4.14
   axios: 1.7.4
   basic-auth: 2.0.1
+  chokidar: 4.0.1
   fast-glob: 3.2.12
   form-data: 4.0.0
   lodash: 4.17.21
@@ -26,12 +27,13 @@ catalog:
 
 catalogs:
   frontend:
-    '@vitest/coverage-v8': ^2.0.5
-    vite: ^5.4.6
-    vitest: ^2.1.1
+    '@vitest/coverage-v8': ^2.1.2
+    '@sentry/vue': ^8.33.1
+    vite: ^5.4.8
+    vitest: ^2.1.2
     vitest-mock-extended: ^2.0.2
-    vue: ^3.4.21
-    vue-router: ^4.4.2
-    vue-tsc: ^2.0.19
+    vue: ^3.5.11
+    vue-router: ^4.4.5
+    vue-tsc: ^2.1.6
     vue-markdown-render: ^2.2.1
     highlight.js: ^11.8.0