diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
index f567dfc926..d4c8dc2ba8 100644
--- a/.github/docker-compose.yml
+++ b/.github/docker-compose.yml
@@ -7,6 +7,8 @@ services:
       - MARIADB_MYSQL_LOCALHOST_USER=true
     ports:
       - 3306:3306
+    tmpfs:
+      - /var/lib/mysql
 
   postgres:
     image: postgres:16
@@ -17,3 +19,5 @@ services:
       - POSTGRES_PASSWORD=password
     ports:
       - 5432:5432
+    tmpfs:
+      - /var/lib/postgresql/data
diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 2bb91dd065..ec9de8dedc 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -74,6 +74,8 @@ jobs:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
           SKIP_STATISTICS_EVENTS: true
           DB_SQLITE_POOL_SIZE: 4
+          N8N_SENTRY_DSN: ${{secrets.CI_SENTRY_DSN}}
+
       # -
       #   name: Export credentials
       #   if: always()
@@ -93,7 +95,7 @@ jobs:
 
       - name: Notify Slack on failure
         uses: act10ns/slack@v2.0.0
-        if: failure()
+        if: failure() && github.ref == 'refs/heads/master'
         with:
           status: ${{ job.status }}
           channel: '#alerts-build'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c7a1e036f..56003af56b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,89 @@
+# [1.70.0](https://github.com/n8n-io/n8n/compare/n8n@1.69.0...n8n@1.70.0) (2024-11-27)
+
+
+### Bug Fixes
+
+* **AI Agent Node:** Add binary message before scratchpad to prevent tool calling loops ([#11845](https://github.com/n8n-io/n8n/issues/11845)) ([5c80cb5](https://github.com/n8n-io/n8n/commit/5c80cb57cf709a1097a38e0394aad6fce5330eba))
+* CodeNodeEditor walk  cannot read properties of null ([#11129](https://github.com/n8n-io/n8n/issues/11129)) ([d99e0a7](https://github.com/n8n-io/n8n/commit/d99e0a7c979a1ee96b2eea1b9011d5bce375289a))
+* **core:** Bring back execution data on the `executionFinished` push message ([#11821](https://github.com/n8n-io/n8n/issues/11821)) ([0313570](https://github.com/n8n-io/n8n/commit/03135702f18e750ba44840dccfec042270629a2b))
+* **core:** Correct invalid WS status code on removing connection ([#11901](https://github.com/n8n-io/n8n/issues/11901)) ([1d80225](https://github.com/n8n-io/n8n/commit/1d80225d26ba01f78934a455acdcca7b83be7205))
+* **core:** Don't use unbound context methods in code sandboxes ([#11914](https://github.com/n8n-io/n8n/issues/11914)) ([f6c0d04](https://github.com/n8n-io/n8n/commit/f6c0d045e9683cd04ee849f37b96697097c5b41d))
+* **core:** Fix broken execution query when using projectId ([#11852](https://github.com/n8n-io/n8n/issues/11852)) ([a061dbc](https://github.com/n8n-io/n8n/commit/a061dbca07ad686c563e85c56081bc1a7830259b))
+* **core:** Fix validation of items returned in the task runner ([#11897](https://github.com/n8n-io/n8n/issues/11897)) ([a535e88](https://github.com/n8n-io/n8n/commit/a535e88f1aec8fbbf2eb9397d38748f49773de2d))
+* **editor:** Add missing trigger waiting tooltip on new canvas ([#11918](https://github.com/n8n-io/n8n/issues/11918)) ([a8df221](https://github.com/n8n-io/n8n/commit/a8df221bfbb5428d93d03f539bcfdaf29ee20c21))
+* **editor:** Don't re-render input panel after node finishes executing ([#11813](https://github.com/n8n-io/n8n/issues/11813)) ([b3a99a2](https://github.com/n8n-io/n8n/commit/b3a99a2351079c37ed6d83f43920ba80f3832234))
+* **editor:** Fix AI assistant loading message layout ([#11819](https://github.com/n8n-io/n8n/issues/11819)) ([89b4807](https://github.com/n8n-io/n8n/commit/89b48072432753137b498c338af7777036fdde7a))
+* **editor:** Fix new canvas discovery tooltip position after adding github stars button ([#11898](https://github.com/n8n-io/n8n/issues/11898)) ([f4ab5c7](https://github.com/n8n-io/n8n/commit/f4ab5c7b9244b8fdde427c12c1a152fbaaba0c34))
+* **editor:** Fix node position not getting set when dragging selection on new canvas ([#11871](https://github.com/n8n-io/n8n/issues/11871)) ([595de81](https://github.com/n8n-io/n8n/commit/595de81c03b3e488ab41fb8d1d316c3db6a8372a))
+* **editor:** Restore workers view ([#11876](https://github.com/n8n-io/n8n/issues/11876)) ([3aa72f6](https://github.com/n8n-io/n8n/commit/3aa72f613f64c16d7dff67ffe66037894e45aa7c))
+* **editor:** Turn NPS survey into a modal and make sure it shows above the Ask AI button ([#11814](https://github.com/n8n-io/n8n/issues/11814)) ([ca169f3](https://github.com/n8n-io/n8n/commit/ca169f3f3455fa39ce9120b30d7b409bade6561e))
+* **editor:** Use `crypto.randomUUID()` to initialize node id if missing on new canvas ([#11873](https://github.com/n8n-io/n8n/issues/11873)) ([bc4857a](https://github.com/n8n-io/n8n/commit/bc4857a1b3d6ea389f11fb8246a1cee33b8a008e))
+* **n8n Form Node:** Duplicate popup in manual mode ([#11925](https://github.com/n8n-io/n8n/issues/11925)) ([2c34bf4](https://github.com/n8n-io/n8n/commit/2c34bf4ea6137fb0fb321969684ffa621da20fa3))
+* **n8n Form Node:** Redirect if completion page to trigger ([#11822](https://github.com/n8n-io/n8n/issues/11822)) ([1a8fb7b](https://github.com/n8n-io/n8n/commit/1a8fb7bdc428c6a23c8708e2dcf924f1f10b47a9))
+* **OpenAI Node:** Remove preview chatInput parameter for `Assistant:Messsage` operation ([#11825](https://github.com/n8n-io/n8n/issues/11825)) ([4dde287](https://github.com/n8n-io/n8n/commit/4dde287cde3af7c9c0e57248e96b8f1270da9332))
+* Retain execution data between partial executions (new flow) ([#11828](https://github.com/n8n-io/n8n/issues/11828)) ([3320436](https://github.com/n8n-io/n8n/commit/3320436a6fdf8472b3843b9fe8d4de7af7f5ef5c))
+
+
+### Features
+
+* Add SharePoint credentials ([#11570](https://github.com/n8n-io/n8n/issues/11570)) ([05c6109](https://github.com/n8n-io/n8n/commit/05c61091db9bdd62fdcca910ead50d0bd512966a))
+* Add Zabbix credential only node ([#11489](https://github.com/n8n-io/n8n/issues/11489)) ([fbd1ecf](https://github.com/n8n-io/n8n/commit/fbd1ecfb29461fee393914bc200ec72c654d8944))
+* **AI Transform Node:** Support for drag and drop ([#11276](https://github.com/n8n-io/n8n/issues/11276)) ([2c252b0](https://github.com/n8n-io/n8n/commit/2c252b0b2d5282f4a87bce76f93c4c02dd8ff5e3))
+* **editor:** Drop `response` wrapper requirement from Subworkflow Tool output ([#11785](https://github.com/n8n-io/n8n/issues/11785)) ([cd3598a](https://github.com/n8n-io/n8n/commit/cd3598aaab6cefe58a4cb9df7d93fb501415e9d3))
+* **editor:** Improve node and edge bring-to-front mechanism on new canvas ([#11793](https://github.com/n8n-io/n8n/issues/11793)) ([b89ca9d](https://github.com/n8n-io/n8n/commit/b89ca9d482faa5cb542898f3973fb6e7c9a8437a))
+* **editor:** Make new canvas connections go underneath node when looping backwards ([#11833](https://github.com/n8n-io/n8n/issues/11833)) ([91d1bd8](https://github.com/n8n-io/n8n/commit/91d1bd8d333454f3971605df73c3703102d2a9e9))
+* **editor:** Make the left sidebar in Expressions editor draggable ([#11838](https://github.com/n8n-io/n8n/issues/11838)) ([a713b3e](https://github.com/n8n-io/n8n/commit/a713b3ed25feb1790412fc320cf41a0967635263))
+* **editor:** Migrate existing users to new canvas and set new canvas as default ([#11896](https://github.com/n8n-io/n8n/issues/11896)) ([caa7447](https://github.com/n8n-io/n8n/commit/caa744785a2cc5063a5fb9d269c0ea53ea432298))
+* **Slack Node:** Update wait for approval to use markdown ([#11754](https://github.com/n8n-io/n8n/issues/11754)) ([40dd02f](https://github.com/n8n-io/n8n/commit/40dd02f360d0d8752fe89c4304c18cac9858c530))
+
+
+
+# [1.69.0](https://github.com/n8n-io/n8n/compare/n8n@1.68.0...n8n@1.69.0) (2024-11-20)
+
+
+### Bug Fixes
+
+* Add supported versions warning to Zep memory node ([#11803](https://github.com/n8n-io/n8n/issues/11803)) ([9cc5bc1](https://github.com/n8n-io/n8n/commit/9cc5bc1aef974fe6c2511c1597b90c8b54ba6b9c))
+* **AI Agent Node:** Escape curly brackets in tools description for non Tool agents ([#11772](https://github.com/n8n-io/n8n/issues/11772)) ([83abdfa](https://github.com/n8n-io/n8n/commit/83abdfaf027a0533824a3ac3e4bab3cad971821a))
+* **Anthropic Chat Model Node:** Update credentials test endpoint ([#11756](https://github.com/n8n-io/n8n/issues/11756)) ([6cf0aba](https://github.com/n8n-io/n8n/commit/6cf0abab5bcddb407571271b9f174e66bb209790))
+* **core:** Add missing env vars to task runner config ([#11810](https://github.com/n8n-io/n8n/issues/11810)) ([870c576](https://github.com/n8n-io/n8n/commit/870c576ed9d7ce4ef005db9c8bedd78e91084c9c))
+* **core:** Allow Azure's SAML metadata XML containing WS-Federation nodes to pass validation ([#11724](https://github.com/n8n-io/n8n/issues/11724)) ([3b62bd5](https://github.com/n8n-io/n8n/commit/3b62bd58c264be0225a74ae0eb35c4761c419b79))
+* **core:** Delete binary data parent folder when pruning executions ([#11790](https://github.com/n8n-io/n8n/issues/11790)) ([17ef2c6](https://github.com/n8n-io/n8n/commit/17ef2c63f69b811bdd28006df3b6edd446837971))
+* **core:** Fix `diagnostics.enabled` default value ([#11809](https://github.com/n8n-io/n8n/issues/11809)) ([5fa72b0](https://github.com/n8n-io/n8n/commit/5fa72b0512b00bdc6a1065b7b604c9640f469454))
+* **core:** Improve the security on OAuth callback endpoints  ([#11593](https://github.com/n8n-io/n8n/issues/11593)) ([274fcf4](https://github.com/n8n-io/n8n/commit/274fcf45d393d8db1d2fb5ae1e774a4c9198a178))
+* **core:** Restore old names for pruning config keys ([#11782](https://github.com/n8n-io/n8n/issues/11782)) ([d15b8d0](https://github.com/n8n-io/n8n/commit/d15b8d05092d2ed9dd45fcfa34b4177f60469ebd))
+* **core:** Unload any existing version of a community nodes package before upgrading it ([#11727](https://github.com/n8n-io/n8n/issues/11727)) ([1d8fd13](https://github.com/n8n-io/n8n/commit/1d8fd13d841b73466ba5f8044d17d7199da7e856))
+* **editor:** Add documentation link to insufficient quota message ([#11777](https://github.com/n8n-io/n8n/issues/11777)) ([1987363](https://github.com/n8n-io/n8n/commit/1987363f7941285c51fda849a4ac92832368b25a))
+* **editor:** Add project header subtitle ([#11797](https://github.com/n8n-io/n8n/issues/11797)) ([ff4261c](https://github.com/n8n-io/n8n/commit/ff4261c16845c7de1790fdf0eaa9f57b37822289))
+* **editor:** Change Home label to Overview ([#11736](https://github.com/n8n-io/n8n/issues/11736)) ([1a78360](https://github.com/n8n-io/n8n/commit/1a783606b4ef22d85e173a2a780d5c49ff208932))
+* **editor:** Fix executions sorting ([#11808](https://github.com/n8n-io/n8n/issues/11808)) ([cd5ad65](https://github.com/n8n-io/n8n/commit/cd5ad65e90a3be4d67b51521772e0fceb7f4abc7))
+* **editor:** Fix partial executions not working due to broken push message queue and race conditions ([#11798](https://github.com/n8n-io/n8n/issues/11798)) ([b05d435](https://github.com/n8n-io/n8n/commit/b05d43519994abdd34a65462d14184c779d0b667))
+* **editor:** Fix reordered switch connections when copying nodes on new canvas ([#11788](https://github.com/n8n-io/n8n/issues/11788)) ([6c2dad7](https://github.com/n8n-io/n8n/commit/6c2dad79143f5b0c255ab8c97c3255314834c458))
+* **editor:** Fix the issue with RMC Values to Send collection disappears  ([#11710](https://github.com/n8n-io/n8n/issues/11710)) ([7bb9002](https://github.com/n8n-io/n8n/commit/7bb9002cbc10cf58550f53a30c6fd7151f8e7355))
+* **editor:** Improve formatting of expired trial error message ([#11708](https://github.com/n8n-io/n8n/issues/11708)) ([8a0ad0f](https://github.com/n8n-io/n8n/commit/8a0ad0f910feeada6d0c63e81c3e97a1a6e44de7))
+* **editor:** Optimize application layout ([#11769](https://github.com/n8n-io/n8n/issues/11769)) ([91f9390](https://github.com/n8n-io/n8n/commit/91f9390b90a68d064ea00d10505bf3767ddec1d4))
+* **Google Sheets Trigger Node:** Fix issue with regex showing correct sheet as invalid ([#11770](https://github.com/n8n-io/n8n/issues/11770)) ([d5ba1a0](https://github.com/n8n-io/n8n/commit/d5ba1a059b7a67154f17f8ad3fcfe66c5c031059))
+* **HTTP Request Node:** Continue using error ([#11733](https://github.com/n8n-io/n8n/issues/11733)) ([d1bae1a](https://github.com/n8n-io/n8n/commit/d1bae1ace062dd5b64087e0313e78599b5994355))
+* **n8n Form Node:** Support expressions in completion page ([#11781](https://github.com/n8n-io/n8n/issues/11781)) ([1099167](https://github.com/n8n-io/n8n/commit/10991675fe2e6913e8f03d565b670257941f18e5))
+* Prevent workflow to run if active and single webhook service ([#11752](https://github.com/n8n-io/n8n/issues/11752)) ([bcb9a20](https://github.com/n8n-io/n8n/commit/bcb9a2078186ff80e03ca3b8532d3585c307d86b))
+* **Read/Write Files from Disk Node:** Escape parenthesis when reading file ([#11753](https://github.com/n8n-io/n8n/issues/11753)) ([285534e](https://github.com/n8n-io/n8n/commit/285534e6d0ceb60290bd0a928054e494252148fe))
+* **YouTube Node:** Issue in published before and after dates filters ([#11741](https://github.com/n8n-io/n8n/issues/11741)) ([7381c28](https://github.com/n8n-io/n8n/commit/7381c28af00148b329690021b921267a48a6eaa3))
+
+
+### Features
+
+* **core:** Improve debugging of sub-workflows ([#11602](https://github.com/n8n-io/n8n/issues/11602)) ([fd3254d](https://github.com/n8n-io/n8n/commit/fd3254d5874a03b57421246b77a519787536a93e))
+* **core:** Improve handling of manual executions with wait nodes ([#11750](https://github.com/n8n-io/n8n/issues/11750)) ([61696c3](https://github.com/n8n-io/n8n/commit/61696c3db313cdc97925af728ff5c68415f9b6b2))
+* **editor:** Add Info Note to NDV Output Panel if no existing Tools were used during Execution ([#11672](https://github.com/n8n-io/n8n/issues/11672)) ([de0e861](https://github.com/n8n-io/n8n/commit/de0e86150f4d0615481e5ec3869465cfd1ce822f))
+* **editor:** Add option to create sub workflow from workflows list in `Execute Workflow` node ([#11706](https://github.com/n8n-io/n8n/issues/11706)) ([c265d44](https://github.com/n8n-io/n8n/commit/c265d44841eb147115563ce24c56666b1e321433))
+* **editor:** Add selection navigation using the keyboard on new canvas ([#11679](https://github.com/n8n-io/n8n/issues/11679)) ([6cd9b99](https://github.com/n8n-io/n8n/commit/6cd9b996af0406caf65941503276524de9e2add4))
+* **editor:** Add universal Create Resource Menu ([#11564](https://github.com/n8n-io/n8n/issues/11564)) ([b38ce14](https://github.com/n8n-io/n8n/commit/b38ce14ec94d74aa1c9780a0572804ff6266588d))
+* **Embeddings Azure OpenAI Node, Azure OpenAI Chat Model Node:** Add support for basePath url in Azure Open AI nodes ([#11784](https://github.com/n8n-io/n8n/issues/11784)) ([e298ebe](https://github.com/n8n-io/n8n/commit/e298ebe90d69f466ee897855472eaa7be1d96aba))
+* **Embeddings OpenAI Node, Embeddings Azure OpenAI Node:** Add dimensions option ([#11773](https://github.com/n8n-io/n8n/issues/11773)) ([de01a8a](https://github.com/n8n-io/n8n/commit/de01a8a01d37f33ab8bcbc65588cafebda969922))
+* GitHub stars dismiss button ([#11794](https://github.com/n8n-io/n8n/issues/11794)) ([8fbad74](https://github.com/n8n-io/n8n/commit/8fbad74ab685c2ba0395c30cee0ddf9498fb8984))
+
+
+
 # [1.68.0](https://github.com/n8n-io/n8n/compare/n8n@1.67.0...n8n@1.68.0) (2024-11-13)
 
 
diff --git a/cypress/composables/modals/credential-modal.ts b/cypress/composables/modals/credential-modal.ts
index 8ce6a86049..77b69fc586 100644
--- a/cypress/composables/modals/credential-modal.ts
+++ b/cypress/composables/modals/credential-modal.ts
@@ -35,7 +35,11 @@ export function setCredentialConnectionParameterInputByName(name: string, value:
 }
 
 export function saveCredential() {
-	getCredentialSaveButton().click({ force: true });
+	getCredentialSaveButton()
+		.click({ force: true })
+		.within(() => {
+			cy.get('button').should('not.exist');
+		});
 }
 
 export function closeCredentialModal() {
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index 51b4a674d3..8a8fd4e4c1 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -88,7 +88,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 
 		cy.visit(workflowsPage.url);
 		workflowsPage.getters.workflowCards().should('have.length', 1);
-		workflowsPage.getters.workflowCard('Workflow W1').click();
+		workflowsPage.getters.workflowCardContent('Workflow W1').click();
 		workflowPage.actions.addNodeToCanvas('Airtable', true, true);
 		ndv.getters.credentialInput().find('input').should('have.value', 'Credential C2');
 		ndv.actions.close();
@@ -104,7 +104,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 
 		cy.visit(workflowsPage.url);
 		workflowsPage.getters.workflowCards().should('have.length', 2);
-		workflowsPage.getters.workflowCard('Workflow W1').click();
+		workflowsPage.getters.workflowCardContent('Workflow W1').click();
 		workflowPage.actions.addNodeToCanvas('Airtable', true, true);
 		ndv.getters.credentialInput().find('input').should('have.value', 'Credential C2');
 		ndv.actions.close();
@@ -133,7 +133,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 
 		cy.visit(workflowsPage.url);
 		workflowsPage.getters.workflowCards().should('have.length', 2);
-		workflowsPage.getters.workflowCard('Workflow W1').click();
+		workflowsPage.getters.workflowCardContent('Workflow W1').click();
 		workflowPage.actions.openNode('Notion');
 		ndv.getters
 			.credentialInput()
@@ -144,7 +144,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 
 		cy.waitForLoad();
 		cy.visit(workflowsPage.url);
-		workflowsPage.getters.workflowCard('Workflow W2').click('top');
+		workflowsPage.getters.workflowCardContent('Workflow W2').click('top');
 		workflowPage.actions.executeWorkflow();
 	});
 
@@ -353,7 +353,7 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		credentialsPage.getters.emptyListCreateCredentialButton().click();
 		credentialsModal.actions.createNewCredential('Notion API');
 		cy.visit(workflowsPage.url);
-		workflowsPage.getters.workflowCard(workflowName).click();
+		workflowsPage.getters.workflowCardContent(workflowName).click();
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 
 		// Only the own credential the shared one (+ the 'Create new' option)
@@ -398,7 +398,7 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		credentialsPage.getters.createCredentialButton().click();
 		credentialsModal.actions.createNewCredential('Notion API');
 		cy.visit(workflowsPage.url);
-		workflowsPage.getters.workflowCard(workflowName).click();
+		workflowsPage.getters.workflowCardContent(workflowName).click();
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 
 		// Only the personal credentials of the workflow owner and the global owner
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index bbd0508662..cc1ab5ca36 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -186,7 +186,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		menuItems.filter(':contains("Development")[class*=active_]').should('exist');
 
 		cy.intercept('GET', '/rest/workflows/*').as('loadWorkflow');
-		workflowsPage.getters.workflowCards().first().click();
+		workflowsPage.getters.workflowCards().first().findChildByTestId('card-content').click();
 
 		cy.wait('@loadWorkflow');
 		menuItems = cy.getByTestId('menu-item');
@@ -747,7 +747,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 
 			// Open the moved workflow
 			workflowsPage.getters.workflowCards().should('have.length', 1);
-			workflowsPage.getters.workflowCards().first().click();
+			workflowsPage.getters.workflowCards().first().findChildByTestId('card-content').click();
 
 			// Check if the credential can be changed
 			workflowPage.getters.canvasNodeByName(NOTION_NODE_NAME).should('be.visible').dblclick();
diff --git a/cypress/pages/workflows.ts b/cypress/pages/workflows.ts
index 199cc3d31c..41f62e8bc3 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -56,6 +56,8 @@ export class WorkflowsPage extends BasePage {
 				.parents('[data-test-id="resources-list-item"]'),
 		workflowTags: (workflowName: string) =>
 			this.getters.workflowCard(workflowName).findChildByTestId('workflow-card-tags'),
+		workflowCardContent: (workflowName: string) =>
+			this.getters.workflowCard(workflowName).findChildByTestId('card-content'),
 		workflowActivator: (workflowName: string) =>
 			this.getters.workflowCard(workflowName).findChildByTestId('workflow-card-activator'),
 		workflowActivatorStatus: (workflowName: string) =>
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index bc5a18a34f..c414c9fea9 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -75,8 +75,13 @@ Cypress.Commands.add('signin', ({ email, password }) => {
 			.then((response) => {
 				Cypress.env('currentUserId', response.body.data.id);
 
+				// @TODO Remove this once the switcher is removed
 				cy.window().then((win) => {
-					win.localStorage.setItem('NodeView.switcher.discovered', 'true'); // @TODO Remove this once the switcher is removed
+					win.localStorage.setItem('NodeView.migrated', 'true');
+					win.localStorage.setItem('NodeView.switcher.discovered.beta', 'true');
+
+					const nodeViewVersion = Cypress.env('NODE_VIEW_VERSION');
+					win.localStorage.setItem('NodeView.version', nodeViewVersion ?? '1');
 				});
 			});
 	});
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 4261cb4b63..0fe782499d 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -20,11 +20,6 @@ beforeEach(() => {
 		win.localStorage.setItem('N8N_THEME', 'light');
 		win.localStorage.setItem('N8N_AUTOCOMPLETE_ONBOARDED', 'true');
 		win.localStorage.setItem('N8N_MAPPING_ONBOARDED', 'true');
-
-		const nodeViewVersion = Cypress.env('NODE_VIEW_VERSION');
-		if (nodeViewVersion) {
-			win.localStorage.setItem('NodeView.version', nodeViewVersion);
-		}
 	});
 
 	cy.intercept('GET', '/rest/settings', (req) => {
diff --git a/cypress/utils/executions.ts b/cypress/utils/executions.ts
index 12f4d2454a..11eb5bba2c 100644
--- a/cypress/utils/executions.ts
+++ b/cypress/utils/executions.ts
@@ -1,5 +1,6 @@
 import { stringify } from 'flatted';
-import type { IDataObject, IPinData, ITaskData, ITaskDataConnections } from 'n8n-workflow';
+import type { IDataObject, ITaskData, ITaskDataConnections } from 'n8n-workflow';
+import { nanoid } from 'nanoid';
 
 import { clickExecuteWorkflowButton } from '../composables/workflow';
 
@@ -39,38 +40,6 @@ export function createMockNodeExecutionData(
 	};
 }
 
-function createMockWorkflowExecutionData({
-	runData,
-	lastNodeExecuted,
-}: {
-	runData: Record<string, ITaskData | ITaskData[]>;
-	pinData?: IPinData;
-	lastNodeExecuted: string;
-}) {
-	return {
-		data: stringify({
-			startData: {},
-			resultData: {
-				runData,
-				pinData: {},
-				lastNodeExecuted,
-			},
-			executionData: {
-				contextData: {},
-				nodeExecutionStack: [],
-				metadata: {},
-				waitingExecution: {},
-				waitingExecutionSource: {},
-			},
-		}),
-		mode: 'manual',
-		startedAt: new Date().toISOString(),
-		stoppedAt: new Date().toISOString(),
-		status: 'success',
-		finished: true,
-	};
-}
-
 export function runMockWorkflowExecution({
 	trigger,
 	lastNodeExecuted,
@@ -80,6 +49,7 @@ export function runMockWorkflowExecution({
 	lastNodeExecuted: string;
 	runData: Array<ReturnType<typeof createMockNodeExecutionData>>;
 }) {
+	const workflowId = nanoid();
 	const executionId = Math.floor(Math.random() * 1_000_000).toString();
 
 	cy.intercept('POST', '/rest/workflows/**/run?**', {
@@ -117,17 +87,24 @@ export function runMockWorkflowExecution({
 		resolvedRunData[nodeName] = nodeExecution[nodeName];
 	});
 
-	cy.intercept('GET', `/rest/executions/${executionId}`, {
-		statusCode: 200,
-		body: {
-			data: createMockWorkflowExecutionData({
+	cy.push('executionFinished', {
+		executionId,
+		workflowId,
+		status: 'success',
+		rawData: stringify({
+			startData: {},
+			resultData: {
+				runData,
+				pinData: {},
 				lastNodeExecuted,
-				runData: resolvedRunData,
-			}),
-		},
-	}).as('getExecution');
-
-	cy.push('executionFinished', { executionId });
-
-	cy.wait('@getExecution');
+			},
+			executionData: {
+				contextData: {},
+				nodeExecutionStack: [],
+				metadata: {},
+				waitingExecution: {},
+				waitingExecutionSource: {},
+			},
+		}),
+	});
 }
diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
index 797e78b3c6..210fc0630f 100644
--- a/docker/images/n8n-custom/Dockerfile
+++ b/docker/images/n8n-custom/Dockerfile
@@ -33,7 +33,7 @@ COPY docker/images/n8n/docker-entrypoint.sh /
 
 # Setup the Task Runner Launcher
 ARG TARGETPLATFORM
-ARG LAUNCHER_VERSION=0.3.0-rc
+ARG LAUNCHER_VERSION=0.6.0-rc
 COPY docker/images/n8n/n8n-task-runners.json /etc/n8n-task-runners.json
 # Download, verify, then extract the launcher binary
 RUN \
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index 8acfc411cf..fe4aee41dc 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -24,7 +24,7 @@ RUN set -eux; \
 
 # Setup the Task Runner Launcher
 ARG TARGETPLATFORM
-ARG LAUNCHER_VERSION=0.3.0-rc
+ARG LAUNCHER_VERSION=0.6.0-rc
 COPY n8n-task-runners.json /etc/n8n-task-runners.json
 # Download, verify, then extract the launcher binary
 RUN \
diff --git a/package.json b/package.json
index bdf3221845..6a44807240 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.68.0",
+  "version": "1.70.0",
   "private": true,
   "engines": {
     "node": ">=20.15",
@@ -62,7 +62,7 @@
     "ts-jest": "^29.1.1",
     "tsc-alias": "^1.8.10",
     "tsc-watch": "^6.2.0",
-    "turbo": "2.1.2",
+    "turbo": "2.3.3",
     "typescript": "*",
     "zx": "^8.1.4"
   },
@@ -79,7 +79,7 @@
       "semver": "^7.5.4",
       "tslib": "^2.6.2",
       "tsconfig-paths": "^4.2.0",
-      "typescript": "^5.6.2",
+      "typescript": "^5.7.2",
       "vue-tsc": "^2.1.6",
       "ws": ">=8.17.1"
     },
@@ -89,7 +89,8 @@
       "pyodide@0.23.4": "patches/pyodide@0.23.4.patch",
       "@types/express-serve-static-core@4.17.43": "patches/@types__express-serve-static-core@4.17.43.patch",
       "@types/ws@8.5.4": "patches/@types__ws@8.5.4.patch",
-      "@types/uuencode@0.0.3": "patches/@types__uuencode@0.0.3.patch"
+      "@types/uuencode@0.0.3": "patches/@types__uuencode@0.0.3.patch",
+      "vue-tsc@2.1.6": "patches/vue-tsc@2.1.6.patch"
     }
   }
 }
diff --git a/packages/@n8n/api-types/package.json b/packages/@n8n/api-types/package.json
index 252794f7d1..5b6ce236e0 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.6.0",
+  "version": "0.8.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/api-types/src/frontend-settings.ts b/packages/@n8n/api-types/src/frontend-settings.ts
index 54b7956821..8f9c740ad6 100644
--- a/packages/@n8n/api-types/src/frontend-settings.ts
+++ b/packages/@n8n/api-types/src/frontend-settings.ts
@@ -172,4 +172,5 @@ export interface FrontendSettings {
 		blockFileAccessToN8nFiles: boolean;
 	};
 	betaFeatures: FrontendBetaFeatures[];
+	virtualSchemaView: boolean;
 }
diff --git a/packages/@n8n/api-types/src/push/execution.ts b/packages/@n8n/api-types/src/push/execution.ts
index 9c723e2817..320b3dc264 100644
--- a/packages/@n8n/api-types/src/push/execution.ts
+++ b/packages/@n8n/api-types/src/push/execution.ts
@@ -1,4 +1,4 @@
-import type { ITaskData, WorkflowExecuteMode } from 'n8n-workflow';
+import type { ExecutionStatus, ITaskData, WorkflowExecuteMode } from 'n8n-workflow';
 
 type ExecutionStarted = {
 	type: 'executionStarted';
@@ -9,6 +9,7 @@ type ExecutionStarted = {
 		workflowId: string;
 		workflowName?: string;
 		retryOf?: string;
+		flattedRunData: string;
 	};
 };
 
@@ -23,6 +24,10 @@ type ExecutionFinished = {
 	type: 'executionFinished';
 	data: {
 		executionId: string;
+		workflowId: string;
+		status: ExecutionStatus;
+		/** @deprecated: Please construct execution data in the frontend from the data pushed in previous messages, instead of depending on this additional payload serialization */
+		rawData?: string;
 	};
 };
 
diff --git a/packages/@n8n/chat/src/components/Input.vue b/packages/@n8n/chat/src/components/Input.vue
index 4abfc76849..1b9e0b9608 100644
--- a/packages/@n8n/chat/src/components/Input.vue
+++ b/packages/@n8n/chat/src/components/Input.vue
@@ -38,12 +38,12 @@ const isSubmitting = ref(false);
 const resizeObserver = ref<ResizeObserver | null>(null);
 
 const isSubmitDisabled = computed(() => {
-	return input.value === '' || waitingForResponse.value || options.disabled?.value === true;
+	return input.value === '' || unref(waitingForResponse) || options.disabled?.value === true;
 });
 
 const isInputDisabled = computed(() => options.disabled?.value === true);
 const isFileUploadDisabled = computed(
-	() => isFileUploadAllowed.value && waitingForResponse.value && !options.disabled?.value,
+	() => isFileUploadAllowed.value && unref(waitingForResponse) && !options.disabled?.value,
 );
 const isFileUploadAllowed = computed(() => unref(options.allowFileUploads) === true);
 const allowedFileTypes = computed(() => unref(options.allowedFilesMimeTypes));
@@ -194,10 +194,13 @@ function adjustHeight(event: Event) {
 <template>
 	<div class="chat-input" :style="styleVars" @keydown.stop="onKeyDown">
 		<div class="chat-inputs">
+			<div v-if="$slots.leftPanel" class="chat-input-left-panel">
+				<slot name="leftPanel" />
+			</div>
 			<textarea
 				ref="chatTextArea"
-				data-test-id="chat-input"
 				v-model="input"
+				data-test-id="chat-input"
 				:disabled="isInputDisabled"
 				:placeholder="t(props.placeholder)"
 				@keydown.enter="onSubmitKeydown"
@@ -251,7 +254,7 @@ function adjustHeight(event: Event) {
 	width: 100%;
 	display: flex;
 	justify-content: center;
-	align-items: center;
+	align-items: flex-end;
 
 	textarea {
 		font-family: inherit;
@@ -259,8 +262,7 @@ function adjustHeight(event: Event) {
 		width: 100%;
 		border: var(--chat--input--border, 0);
 		border-radius: var(--chat--input--border-radius, 0);
-		padding: 0.8rem;
-		padding-right: calc(0.8rem + (var(--controls-count, 1) * var(--chat--textarea--height)));
+		padding: var(--chat--input--padding, 0.8rem);
 		min-height: var(--chat--textarea--height, 2.5rem); // Set a smaller initial height
 		max-height: var(--chat--textarea--max-height, 30rem);
 		height: var(--chat--textarea--height, 2.5rem); // Set initial height same as min-height
@@ -271,6 +273,9 @@ function adjustHeight(event: Event) {
 		outline: none;
 		line-height: var(--chat--input--line-height, 1.5);
 
+		&::placeholder {
+			font-size: var(--chat--input--placeholder--font-size, var(--chat--input--font-size, inherit));
+		}
 		&:focus,
 		&:hover {
 			border-color: var(--chat--input--border-active, 0);
@@ -279,9 +284,6 @@ function adjustHeight(event: Event) {
 }
 .chat-inputs-controls {
 	display: flex;
-	position: absolute;
-	right: 0.5rem;
-	bottom: 0;
 }
 .chat-input-send-button,
 .chat-input-file-button {
@@ -340,4 +342,9 @@ function adjustHeight(event: Event) {
 	gap: 0.5rem;
 	padding: var(--chat--files-spacing, 0.25rem);
 }
+
+.chat-input-left-panel {
+	width: var(--chat--input--left--panel--width, 2rem);
+	margin-left: 0.4rem;
+}
 </style>
diff --git a/packages/@n8n/chat/src/components/Message.vue b/packages/@n8n/chat/src/components/Message.vue
index 123bcb6040..4ee4514632 100644
--- a/packages/@n8n/chat/src/components/Message.vue
+++ b/packages/@n8n/chat/src/components/Message.vue
@@ -136,7 +136,8 @@ onMounted(async () => {
 	font-size: var(--chat--message--font-size, 1rem);
 	padding: var(--chat--message--padding, var(--chat--spacing));
 	border-radius: var(--chat--message--border-radius, var(--chat--border-radius));
-	scroll-margin: 100px;
+	scroll-margin: 3rem;
+
 	.chat-message-actions {
 		position: absolute;
 		bottom: calc(100% - 0.5rem);
@@ -151,9 +152,6 @@ onMounted(async () => {
 		left: auto;
 		right: 0;
 	}
-	&.chat-message-from-bot .chat-message-actions {
-		bottom: calc(100% - 1rem);
-	}
 
 	&:hover {
 		.chat-message-actions {
diff --git a/packages/@n8n/chat/src/css/markdown.scss b/packages/@n8n/chat/src/css/markdown.scss
index 6bcf13ba74..1feb199d23 100644
--- a/packages/@n8n/chat/src/css/markdown.scss
+++ b/packages/@n8n/chat/src/css/markdown.scss
@@ -37,8 +37,7 @@ body {
 		4. Prevent font size adjustment after orientation changes (IE, iOS)
 		5. Prevent overflow from long words (all)
 	*/
-	font-size: 110%; /* 2 */
-	line-height: 1.6; /* 3 */
+	line-height: 1.4; /* 3 */
 	-webkit-text-size-adjust: 100%; /* 4 */
 	word-break: break-word; /* 5 */
 
@@ -407,7 +406,7 @@ body {
 	h4,
 	h5,
 	h6 {
-		margin: 3.2rem 0 0.8em;
+		margin: 2rem 0 0.8em;
 	}
 
 	/*
@@ -641,4 +640,15 @@ body {
 	body > a:first-child:focus {
 		top: 1rem;
 	}
+
+	// Lists
+	ul,
+	ol {
+		padding-left: 1.5rem;
+		margin-bottom: 1rem;
+
+		li {
+			margin-bottom: 0.5rem;
+		}
+	}
 }
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index 20d1aec726..8bec6363b5 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.18.0",
+  "version": "1.20.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
index 406512f832..d3fca6da08 100644
--- a/packages/@n8n/config/src/configs/runners.config.ts
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -43,10 +43,6 @@ export class TaskRunnersConfig {
 	@Env('N8N_RUNNERS_MAX_CONCURRENCY')
 	maxConcurrency: number = 5;
 
-	/** Should the output of deduplication be asserted for correctness */
-	@Env('N8N_RUNNERS_ASSERT_DEDUPLICATION_OUTPUT')
-	assertDeduplicationOutput: boolean = false;
-
 	/** How long (in seconds) a task is allowed to take for completion, else the task will be aborted and the runner restarted. Must be greater than 0. */
 	@Env('N8N_RUNNERS_TASK_TIMEOUT')
 	taskTimeout: number = 60;
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index c5dc2a35b5..58b808ee4b 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -231,7 +231,6 @@ describe('GlobalConfig', () => {
 			port: 5679,
 			maxOldSpaceSize: '',
 			maxConcurrency: 5,
-			assertDeduplicationOutput: false,
 			taskTimeout: 60,
 			heartbeatInterval: 30,
 		},
diff --git a/packages/@n8n/imap/package.json b/packages/@n8n/imap/package.json
index 81643869a0..5a1d6b54f1 100644
--- a/packages/@n8n/imap/package.json
+++ b/packages/@n8n/imap/package.json
@@ -20,7 +20,7 @@
     "dist/**/*"
   ],
   "dependencies": {
-    "iconv-lite": "0.6.3",
+    "iconv-lite": "catalog:",
     "imap": "0.8.19",
     "quoted-printable": "1.0.1",
     "utf8": "3.0.0",
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 25e6e78984..74d6819961 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
@@ -258,7 +258,6 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 		['system', `{system_message}${outputParser ? '\n\n{formatting_instructions}' : ''}`],
 		['placeholder', '{chat_history}'],
 		['human', '{input}'],
-		['placeholder', '{agent_scratchpad}'],
 	];
 
 	const hasBinaryData = this.getInputData(0, 'main')?.[0]?.binary !== undefined;
@@ -266,6 +265,9 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 		const binaryMessage = await extractBinaryMessages(this);
 		messages.push(binaryMessage);
 	}
+	// We add the agent scratchpad last, so that the agent will not run in loops
+	// by adding binary messages between each interaction
+	messages.push(['placeholder', '{agent_scratchpad}']);
 	const prompt = ChatPromptTemplate.fromMessages(messages);
 
 	const agent = createToolCallingAgent({
diff --git a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
index 8708e0c7ea..d73d6d3268 100644
--- a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
@@ -81,31 +81,20 @@ function getSandbox(
 	const workflowMode = this.getMode();
 
 	const context = getSandboxContext.call(this, itemIndex);
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.addInputData = this.addInputData;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.addOutputData = this.addOutputData;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.getInputConnectionData = this.getInputConnectionData;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.getInputData = this.getInputData;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.getNode = this.getNode;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.getExecutionCancelSignal = this.getExecutionCancelSignal;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.getNodeOutputs = this.getNodeOutputs;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.executeWorkflow = this.executeWorkflow;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
-	context.getWorkflowDataProxy = this.getWorkflowDataProxy;
-	// eslint-disable-next-line @typescript-eslint/unbound-method
+	context.addInputData = this.addInputData.bind(this);
+	context.addOutputData = this.addOutputData.bind(this);
+	context.getInputConnectionData = this.getInputConnectionData.bind(this);
+	context.getInputData = this.getInputData.bind(this);
+	context.getNode = this.getNode.bind(this);
+	context.getExecutionCancelSignal = this.getExecutionCancelSignal.bind(this);
+	context.getNodeOutputs = this.getNodeOutputs.bind(this);
+	context.executeWorkflow = this.executeWorkflow.bind(this);
+	context.getWorkflowDataProxy = this.getWorkflowDataProxy.bind(this);
 	context.logger = this.logger;
 
 	if (options?.addItems) {
 		context.items = context.$input.all();
 	}
-	// eslint-disable-next-line @typescript-eslint/unbound-method
 
 	const sandbox = new JavaScriptSandbox(context, code, this.helpers, {
 		resolver: vmResolver,
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 071134f25e..71a77f013c 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
@@ -94,7 +94,7 @@ export class DocumentGithubLoader implements INodeType {
 	};
 
 	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
-		console.log('Supplying data for Github Document Loader');
+		this.logger.debug('Supplying data for Github Document Loader');
 
 		const repository = this.getNodeParameter('repository', itemIndex) as string;
 		const branch = this.getNodeParameter('branch', itemIndex) as string;
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 b76bcc8ec3..d85ff72271 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
@@ -36,7 +36,7 @@ export class ToolWorkflow implements INodeType {
 		name: 'toolWorkflow',
 		icon: 'fa:network-wired',
 		group: ['transform'],
-		version: [1, 1.1, 1.2],
+		version: [1, 1.1, 1.2, 1.3],
 		description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
 		defaults: {
 			name: 'Call n8n Workflow Tool',
@@ -200,6 +200,11 @@ export class ToolWorkflow implements INodeType {
 				hint: 'The field in the last-executed node of the workflow that contains the response',
 				description:
 					'Where to find the data that this tool should return. n8n will look in the output of the last-executed node of the workflow for a field with this name, and return its value.',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { lt: 1.3 } }],
+					},
+				},
 			},
 			{
 				displayName: 'Extra Workflow Inputs',
@@ -376,19 +381,6 @@ export class ToolWorkflow implements INodeType {
 			runManager?: CallbackManagerForToolRun,
 		): Promise<string> => {
 			const source = this.getNodeParameter('source', itemIndex) as string;
-			const responsePropertyName = this.getNodeParameter(
-				'responsePropertyName',
-				itemIndex,
-			) as string;
-
-			if (!responsePropertyName) {
-				throw new NodeOperationError(this.getNode(), "Field to return can't be empty", {
-					itemIndex,
-					description:
-						'Enter the name of a field in the last node of the workflow that contains the response to return',
-				});
-			}
-
 			const workflowInfo: IExecuteWorkflowInfo = {};
 			if (source === 'database') {
 				// Read workflow from database
@@ -467,17 +459,13 @@ export class ToolWorkflow implements INodeType {
 				throw new NodeOperationError(this.getNode(), error as Error);
 			}
 
-			const response: string | undefined = get(receivedData, [
-				'data',
-				0,
-				0,
-				'json',
-				responsePropertyName,
-			]) as string | undefined;
+			const response: string | undefined = get(receivedData, 'data[0][0].json') as
+				| string
+				| undefined;
 			if (response === undefined) {
 				throw new NodeOperationError(
 					this.getNode(),
-					`There was an error: "The workflow did not return an item with the property '${responsePropertyName}'"`,
+					'There was an error: "The workflow did not return a response"',
 				);
 			}
 
@@ -531,12 +519,10 @@ export class ToolWorkflow implements INodeType {
 			if (executionError) {
 				void this.addOutputData(NodeConnectionType.AiTool, index, executionError, metadata);
 			} else {
-				void this.addOutputData(
-					NodeConnectionType.AiTool,
-					index,
-					[[{ json: { response } }]],
-					metadata,
-				);
+				// Output always needs to be an object
+				// so we try to parse the response as JSON and if it fails we just return the string wrapped in an object
+				const json = jsonParse<IDataObject>(response, { fallbackValue: { response } });
+				void this.addOutputData(NodeConnectionType.AiTool, index, [[{ json }]], metadata);
 			}
 			return response;
 		};
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 9af94a2121..959d487abe 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
@@ -18,7 +18,7 @@ import {
 } from 'n8n-workflow';
 import { OpenAI as OpenAIClient } from 'openai';
 
-import { promptTypeOptions, textFromPreviousNode } from '../../../../../utils/descriptions';
+import { promptTypeOptions } from '../../../../../utils/descriptions';
 import { getConnectedTools } from '../../../../../utils/helpers';
 import { getTracingConfig } from '../../../../../utils/tracing';
 import { formatToOpenAIAssistantTool } from '../../helpers/utils';
@@ -30,16 +30,6 @@ const properties: INodeProperties[] = [
 		...promptTypeOptions,
 		name: 'prompt',
 	},
-	{
-		...textFromPreviousNode,
-		disabledOptions: { show: { prompt: ['auto'] } },
-		displayOptions: {
-			show: {
-				prompt: ['auto'],
-				'@version': [{ _cnd: { gte: 1.7 } }],
-			},
-		},
-	},
 	{
 		displayName: 'Text',
 		name: 'text',
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 23805646ee..da65509956 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.68.0",
+  "version": "1.70.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/@n8n/nodes-langchain/utils/descriptions.ts b/packages/@n8n/nodes-langchain/utils/descriptions.ts
index 4a22e36894..ef683df3e9 100644
--- a/packages/@n8n/nodes-langchain/utils/descriptions.ts
+++ b/packages/@n8n/nodes-langchain/utils/descriptions.ts
@@ -66,7 +66,7 @@ export const inputSchemaField: INodeProperties = {
 };
 
 export const promptTypeOptions: INodeProperties = {
-	displayName: 'Prompt Source',
+	displayName: 'Prompt Source (User Message)',
 	name: 'promptType',
 	type: 'options',
 	options: [
diff --git a/packages/@n8n/task-runner/package.json b/packages/@n8n/task-runner/package.json
index dd9ee6ae17..285d56840f 100644
--- a/packages/@n8n/task-runner/package.json
+++ b/packages/@n8n/task-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/task-runner",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "start": "node dist/start.js",
diff --git a/packages/@n8n/task-runner/src/config/base-runner-config.ts b/packages/@n8n/task-runner/src/config/base-runner-config.ts
index e7949d9704..723d3279bf 100644
--- a/packages/@n8n/task-runner/src/config/base-runner-config.ts
+++ b/packages/@n8n/task-runner/src/config/base-runner-config.ts
@@ -9,7 +9,7 @@ class HealthcheckServerConfig {
 	host: string = '127.0.0.1';
 
 	@Env('N8N_RUNNERS_SERVER_PORT')
-	port: number = 5680;
+	port: number = 5681;
 }
 
 @Config
@@ -26,6 +26,14 @@ export class BaseRunnerConfig {
 	@Env('N8N_RUNNERS_MAX_CONCURRENCY')
 	maxConcurrency: number = 5;
 
+	/**
+	 * How long (in seconds) a runner may be idle for before exit. Intended
+	 * for use in `external` mode - launcher must pass the env var when launching
+	 * the runner. Disabled with `0` on `internal` mode.
+	 */
+	@Env('N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT')
+	idleTimeout: number = 0;
+
 	@Nested
 	healthcheckServer!: HealthcheckServerConfig;
 }
diff --git a/packages/@n8n/task-runner/src/data-request/__tests__/data-request-response-reconstruct.test.ts b/packages/@n8n/task-runner/src/data-request/__tests__/data-request-response-reconstruct.test.ts
new file mode 100644
index 0000000000..40768bb5cc
--- /dev/null
+++ b/packages/@n8n/task-runner/src/data-request/__tests__/data-request-response-reconstruct.test.ts
@@ -0,0 +1,91 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	IExecuteData,
+	INode,
+	INodeExecutionData,
+	ITaskDataConnectionsSource,
+} from 'n8n-workflow';
+
+import type { DataRequestResponse, InputDataChunkDefinition } from '@/runner-types';
+
+import { DataRequestResponseReconstruct } from '../data-request-response-reconstruct';
+
+describe('DataRequestResponseReconstruct', () => {
+	const reconstruct = new DataRequestResponseReconstruct();
+
+	describe('reconstructConnectionInputItems', () => {
+		it('should return all input items if no chunk is provided', () => {
+			const inputData: DataRequestResponse['inputData'] = {
+				main: [[{ json: { key: 'value' } }]],
+			};
+
+			const result = reconstruct.reconstructConnectionInputItems(inputData);
+
+			expect(result).toEqual([{ json: { key: 'value' } }]);
+		});
+
+		it('should reconstruct sparse array when chunk is provided', () => {
+			const inputData: DataRequestResponse['inputData'] = {
+				main: [[{ json: { key: 'chunked' } }]],
+			};
+			const chunk: InputDataChunkDefinition = { startIndex: 2, count: 1 };
+
+			const result = reconstruct.reconstructConnectionInputItems(inputData, chunk);
+
+			expect(result).toEqual([undefined, undefined, { json: { key: 'chunked' } }, undefined]);
+		});
+
+		it('should handle empty input data gracefully', () => {
+			const inputData: DataRequestResponse['inputData'] = { main: [[]] };
+			const chunk: InputDataChunkDefinition = { startIndex: 1, count: 1 };
+
+			const result = reconstruct.reconstructConnectionInputItems(inputData, chunk);
+
+			expect(result).toEqual([undefined]);
+		});
+	});
+
+	describe('reconstructExecuteData', () => {
+		it('should reconstruct execute data with the provided input items', () => {
+			const node = mock<INode>();
+			const connectionInputSource = mock<ITaskDataConnectionsSource>();
+			const response = mock<DataRequestResponse>({
+				inputData: { main: [[]] },
+				node,
+				connectionInputSource,
+			});
+			const inputItems: INodeExecutionData[] = [{ json: { key: 'reconstructed' } }];
+
+			const result = reconstruct.reconstructExecuteData(response, inputItems);
+
+			expect(result).toEqual<IExecuteData>({
+				data: {
+					main: [inputItems],
+				},
+				node: response.node,
+				source: response.connectionInputSource,
+			});
+		});
+
+		it('should handle empty input items gracefully', () => {
+			const node = mock<INode>();
+			const connectionInputSource = mock<ITaskDataConnectionsSource>();
+			const inputItems: INodeExecutionData[] = [];
+			const response = mock<DataRequestResponse>({
+				inputData: { main: [[{ json: { key: 'value' } }]] },
+				node,
+				connectionInputSource,
+			});
+
+			const result = reconstruct.reconstructExecuteData(response, inputItems);
+
+			expect(result).toEqual<IExecuteData>({
+				data: {
+					main: [inputItems],
+				},
+				node: response.node,
+				source: response.connectionInputSource,
+			});
+		});
+	});
+});
diff --git a/packages/@n8n/task-runner/src/data-request/data-request-response-reconstruct.ts b/packages/@n8n/task-runner/src/data-request/data-request-response-reconstruct.ts
index 83a291a491..29f50c3610 100644
--- a/packages/@n8n/task-runner/src/data-request/data-request-response-reconstruct.ts
+++ b/packages/@n8n/task-runner/src/data-request/data-request-response-reconstruct.ts
@@ -1,6 +1,6 @@
-import type { IExecuteData, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteData, INodeExecutionData, ITaskDataConnections } from 'n8n-workflow';
 
-import type { DataRequestResponse } from '@/runner-types';
+import type { DataRequestResponse, InputDataChunkDefinition } from '@/runner-types';
 
 /**
  * Reconstructs data from a DataRequestResponse to the initial
@@ -8,20 +8,43 @@ import type { DataRequestResponse } from '@/runner-types';
  */
 export class DataRequestResponseReconstruct {
 	/**
-	 * Reconstructs `connectionInputData` from a DataRequestResponse
+	 * Reconstructs `inputData` from a DataRequestResponse
 	 */
-	reconstructConnectionInputData(
+	reconstructConnectionInputItems(
 		inputData: DataRequestResponse['inputData'],
-	): INodeExecutionData[] {
-		return inputData?.main?.[0] ?? [];
+		chunk?: InputDataChunkDefinition,
+	): Array<INodeExecutionData | undefined> {
+		const inputItems = inputData?.main?.[0] ?? [];
+		if (!chunk) {
+			return inputItems;
+		}
+
+		// Only a chunk of the input items was requested. We reconstruct
+		// the array by filling in the missing items with `undefined`.
+		let sparseInputItems: Array<INodeExecutionData | undefined> = [];
+
+		sparseInputItems = sparseInputItems
+			.concat(Array.from({ length: chunk.startIndex }))
+			.concat(inputItems)
+			.concat(Array.from({ length: inputItems.length - chunk.startIndex - chunk.count }));
+
+		return sparseInputItems;
 	}
 
 	/**
 	 * Reconstruct `executeData` from a DataRequestResponse
 	 */
-	reconstructExecuteData(response: DataRequestResponse): IExecuteData {
+	reconstructExecuteData(
+		response: DataRequestResponse,
+		inputItems: INodeExecutionData[],
+	): IExecuteData {
+		const inputData: ITaskDataConnections = {
+			...response.inputData,
+			main: [inputItems],
+		};
+
 		return {
-			data: response.inputData,
+			data: inputData,
 			node: response.node,
 			source: response.connectionInputSource,
 		};
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
index cd966ef8ac..05e0b91f77 100644
--- 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
@@ -3,13 +3,14 @@ import type { CodeExecutionMode, IDataObject } from 'n8n-workflow';
 import fs from 'node:fs';
 import { builtinModules } from 'node:module';
 
+import type { BaseRunnerConfig } from '@/config/base-runner-config';
 import type { JsRunnerConfig } from '@/config/js-runner-config';
 import { MainConfig } from '@/config/main-config';
 import { ExecutionError } from '@/js-task-runner/errors/execution-error';
 import { ValidationError } from '@/js-task-runner/errors/validation-error';
 import type { JSExecSettings } from '@/js-task-runner/js-task-runner';
 import { JsTaskRunner } from '@/js-task-runner/js-task-runner';
-import type { DataRequestResponse } from '@/runner-types';
+import type { DataRequestResponse, InputDataChunkDefinition } from '@/runner-types';
 import type { Task } from '@/task-runner';
 
 import {
@@ -24,17 +25,21 @@ jest.mock('ws');
 const defaultConfig = new MainConfig();
 
 describe('JsTaskRunner', () => {
-	const createRunnerWithOpts = (opts: Partial<JsRunnerConfig> = {}) =>
+	const createRunnerWithOpts = (
+		jsRunnerOpts: Partial<JsRunnerConfig> = {},
+		baseRunnerOpts: Partial<BaseRunnerConfig> = {},
+	) =>
 		new JsTaskRunner({
 			baseRunnerConfig: {
 				...defaultConfig.baseRunnerConfig,
 				grantToken: 'grantToken',
 				maxConcurrency: 1,
 				n8nUri: 'localhost',
+				...baseRunnerOpts,
 			},
 			jsRunnerConfig: {
 				...defaultConfig.jsRunnerConfig,
-				...opts,
+				...jsRunnerOpts,
 			},
 			sentryConfig: {
 				sentryDsn: '',
@@ -90,17 +95,19 @@ describe('JsTaskRunner', () => {
 		inputItems,
 		settings,
 		runner,
+		chunk,
 	}: {
 		code: string;
 		inputItems: IDataObject[];
 		settings?: Partial<JSExecSettings>;
-
 		runner?: JsTaskRunner;
+		chunk?: InputDataChunkDefinition;
 	}) => {
 		return await execTaskWithParams({
 			task: newTaskWithSettings({
 				code,
 				nodeMode: 'runOnceForEachItem',
+				chunk,
 				...settings,
 			}),
 			taskData: newDataRequestResponse(inputItems.map(wrapIntoJson)),
@@ -504,6 +511,28 @@ describe('JsTaskRunner', () => {
 			);
 		});
 
+		describe('chunked execution', () => {
+			it('should use correct index for each item', async () => {
+				const outcome = await executeForEachItem({
+					code: 'return { ...$json, idx: $itemIndex }',
+					inputItems: [{ a: 1 }, { b: 2 }, { c: 3 }],
+					chunk: {
+						startIndex: 100,
+						count: 3,
+					},
+				});
+
+				expect(outcome).toEqual({
+					result: [
+						withPairedItem(100, wrapIntoJson({ a: 1, idx: 100 })),
+						withPairedItem(101, wrapIntoJson({ b: 2, idx: 101 })),
+						withPairedItem(102, wrapIntoJson({ c: 3, idx: 102 })),
+					],
+					customData: undefined,
+				});
+			});
+		});
+
 		it('should return static items', async () => {
 			const outcome = await executeForEachItem({
 				code: 'return {json: {b: 1}}',
@@ -796,7 +825,6 @@ describe('JsTaskRunner', () => {
 				code: 'unknown; return []',
 				nodeMode: 'runOnceForAllItems',
 				continueOnFail: false,
-				mode: 'manual',
 				workflowMode: 'manual',
 			});
 			runner.runningTasks.set(taskId, task);
@@ -825,4 +853,100 @@ describe('JsTaskRunner', () => {
 			});
 		});
 	});
+
+	describe('idle timeout', () => {
+		beforeEach(() => {
+			jest.useFakeTimers();
+		});
+
+		afterEach(() => {
+			jest.useRealTimers();
+		});
+
+		it('should set idle timer when instantiated', () => {
+			const idleTimeout = 5;
+			const runner = createRunnerWithOpts({}, { idleTimeout });
+			const emitSpy = jest.spyOn(runner, 'emit');
+
+			jest.advanceTimersByTime(idleTimeout * 1000 - 100);
+			expect(emitSpy).not.toHaveBeenCalledWith('runner:reached-idle-timeout');
+
+			jest.advanceTimersByTime(idleTimeout * 1000);
+			expect(emitSpy).toHaveBeenCalledWith('runner:reached-idle-timeout');
+		});
+
+		it('should reset idle timer when accepting a task', () => {
+			const idleTimeout = 5;
+			const runner = createRunnerWithOpts({}, { idleTimeout });
+			const taskId = '123';
+			const offerId = 'offer123';
+			const emitSpy = jest.spyOn(runner, 'emit');
+
+			jest.advanceTimersByTime(idleTimeout * 1000 - 100);
+			expect(emitSpy).not.toHaveBeenCalledWith('runner:reached-idle-timeout');
+
+			runner.openOffers.set(offerId, {
+				offerId,
+				validUntil: process.hrtime.bigint() + BigInt(idleTimeout * 1000 * 1_000_000),
+			});
+			runner.offerAccepted(offerId, taskId);
+
+			jest.advanceTimersByTime(200);
+			expect(emitSpy).not.toHaveBeenCalledWith('runner:reached-idle-timeout'); // because timer was reset
+
+			runner.runningTasks.clear();
+
+			jest.advanceTimersByTime(idleTimeout * 1000);
+			expect(emitSpy).toHaveBeenCalledWith('runner:reached-idle-timeout');
+		});
+
+		it('should reset idle timer when finishing a task', async () => {
+			const idleTimeout = 5;
+			const runner = createRunnerWithOpts({}, { idleTimeout });
+			const taskId = '123';
+			const emitSpy = jest.spyOn(runner, 'emit');
+			jest.spyOn(runner, 'executeTask').mockResolvedValue({ result: [] });
+
+			runner.runningTasks.set(taskId, {
+				taskId,
+				active: true,
+				cancelled: false,
+			});
+
+			jest.advanceTimersByTime(idleTimeout * 1000 - 100);
+			expect(emitSpy).not.toHaveBeenCalledWith('runner:reached-idle-timeout');
+
+			await runner.receivedSettings(taskId, {});
+
+			jest.advanceTimersByTime(200);
+			expect(emitSpy).not.toHaveBeenCalledWith('runner:reached-idle-timeout'); // because timer was reset
+
+			jest.advanceTimersByTime(idleTimeout * 1000);
+			expect(emitSpy).toHaveBeenCalledWith('runner:reached-idle-timeout');
+		});
+
+		it('should never reach idle timeout if idle timeout is set to 0', () => {
+			const runner = createRunnerWithOpts({}, { idleTimeout: 0 });
+			const emitSpy = jest.spyOn(runner, 'emit');
+
+			jest.advanceTimersByTime(999999);
+			expect(emitSpy).not.toHaveBeenCalledWith('runner:reached-idle-timeout');
+		});
+
+		it('should not reach idle timeout if there are running tasks', () => {
+			const idleTimeout = 5;
+			const runner = createRunnerWithOpts({}, { idleTimeout });
+			const taskId = '123';
+			const emitSpy = jest.spyOn(runner, 'emit');
+
+			runner.runningTasks.set(taskId, {
+				taskId,
+				active: true,
+				cancelled: false,
+			});
+
+			jest.advanceTimersByTime(idleTimeout * 1000);
+			expect(emitSpy).not.toHaveBeenCalledWith('runner:reached-idle-timeout');
+		});
+	});
 });
diff --git a/packages/@n8n/task-runner/src/js-task-runner/__tests__/result-validation.test.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/result-validation.test.ts
new file mode 100644
index 0000000000..7112468863
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/result-validation.test.ts
@@ -0,0 +1,110 @@
+import { ValidationError } from '@/js-task-runner/errors/validation-error';
+import {
+	validateRunForAllItemsOutput,
+	validateRunForEachItemOutput,
+} from '@/js-task-runner/result-validation';
+
+describe('result validation', () => {
+	describe('validateRunForAllItemsOutput', () => {
+		it('should throw an error if the output is not an object', () => {
+			expect(() => {
+				validateRunForAllItemsOutput(undefined);
+			}).toThrowError(ValidationError);
+		});
+
+		it('should throw an error if the output is an array and at least one item has a non-n8n key', () => {
+			expect(() => {
+				validateRunForAllItemsOutput([{ json: {} }, { json: {}, unknownKey: {} }]);
+			}).toThrowError(ValidationError);
+		});
+
+		it('should not throw an error if the output is an array and all items are json wrapped', () => {
+			expect(() => {
+				validateRunForAllItemsOutput([{ json: {} }, { json: {} }, { json: {} }]);
+			}).not.toThrow();
+		});
+
+		test.each([
+			['binary', {}],
+			['pairedItem', {}],
+			['error', {}],
+		])(
+			'should not throw an error if the output item has %s key in addition to json',
+			(key, value) => {
+				expect(() => {
+					validateRunForAllItemsOutput([{ json: {} }, { json: {}, [key]: value }]);
+				}).not.toThrow();
+			},
+		);
+
+		it('should not throw an error if the output is an array and all items are not json wrapped', () => {
+			expect(() => {
+				validateRunForAllItemsOutput([
+					{
+						id: 1,
+						name: 'test3',
+					},
+					{
+						id: 2,
+						name: 'test4',
+					},
+					{
+						id: 3,
+						name: 'test5',
+					},
+					// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				] as any);
+			}).not.toThrow();
+		});
+
+		it('should throw if json is not an object', () => {
+			expect(() => {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				validateRunForAllItemsOutput([{ json: 1 } as any]);
+			}).toThrowError(ValidationError);
+		});
+	});
+
+	describe('validateRunForEachItemOutput', () => {
+		const index = 0;
+
+		it('should throw an error if the output is not an object', () => {
+			expect(() => {
+				validateRunForEachItemOutput(undefined, index);
+			}).toThrowError(ValidationError);
+		});
+
+		it('should throw an error if the output is an array', () => {
+			expect(() => {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				validateRunForEachItemOutput([] as any, index);
+			}).toThrowError(ValidationError);
+		});
+
+		it('should throw if json is not an object', () => {
+			expect(() => {
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+				validateRunForEachItemOutput({ json: 1 } as any, index);
+			}).toThrowError(ValidationError);
+		});
+
+		it('should throw an error if the output is an array and at least one item has a non-n8n key', () => {
+			expect(() => {
+				validateRunForEachItemOutput({ json: {}, unknownKey: {} }, index);
+			}).toThrowError(ValidationError);
+		});
+
+		test.each([
+			['binary', {}],
+			['pairedItem', {}],
+			['error', {}],
+		])(
+			'should not throw an error if the output item has %s key in addition to json',
+			(key, value) => {
+				expect(() => {
+					validateRunForEachItemOutput({ json: {}, [key]: value }, index);
+				}).not.toThrow();
+			},
+		);
+	});
+});
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
index 224f630807..ef910e838f 100644
--- 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
@@ -16,7 +16,6 @@ export const newTaskWithSettings = (
 	settings: {
 		workflowMode: 'manual',
 		continueOnFail: false,
-		mode: 'manual',
 		...settings,
 	},
 	active: true,
diff --git a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser-state.test.ts b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser-state.test.ts
index 0b75ae563e..eb38eb31c4 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser-state.test.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser-state.test.ts
@@ -1,14 +1,17 @@
 import { BuiltInsParserState } from '../built-ins-parser-state';
 
 describe('BuiltInsParserState', () => {
-	describe('toDataRequestSpecification', () => {
+	describe('toDataRequestParams', () => {
 		it('should return empty array when no properties are marked as needed', () => {
 			const state = new BuiltInsParserState();
 
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: [],
 				env: false,
-				input: false,
+				input: {
+					chunk: undefined,
+					include: false,
+				},
 				prevNode: false,
 			});
 		});
@@ -20,7 +23,10 @@ describe('BuiltInsParserState', () => {
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: 'all',
 				env: false,
-				input: true,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
 				prevNode: false,
 			});
 		});
@@ -33,7 +39,10 @@ describe('BuiltInsParserState', () => {
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: ['Node1', 'Node2'],
 				env: false,
-				input: false,
+				input: {
+					chunk: undefined,
+					include: false,
+				},
 				prevNode: false,
 			});
 		});
@@ -47,7 +56,10 @@ describe('BuiltInsParserState', () => {
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: 'all',
 				env: false,
-				input: true,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
 				prevNode: false,
 			});
 		});
@@ -59,7 +71,10 @@ describe('BuiltInsParserState', () => {
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: [],
 				env: true,
-				input: false,
+				input: {
+					chunk: undefined,
+					include: false,
+				},
 				prevNode: false,
 			});
 		});
@@ -71,7 +86,33 @@ describe('BuiltInsParserState', () => {
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: [],
 				env: false,
-				input: true,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
+				prevNode: false,
+			});
+		});
+
+		it('should use the given chunk', () => {
+			const state = new BuiltInsParserState();
+			state.markInputAsNeeded();
+
+			expect(
+				state.toDataRequestParams({
+					count: 10,
+					startIndex: 5,
+				}),
+			).toEqual({
+				dataOfNodes: [],
+				env: false,
+				input: {
+					chunk: {
+						count: 10,
+						startIndex: 5,
+					},
+					include: true,
+				},
 				prevNode: false,
 			});
 		});
@@ -83,7 +124,10 @@ describe('BuiltInsParserState', () => {
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: [],
 				env: false,
-				input: false,
+				input: {
+					chunk: undefined,
+					include: false,
+				},
 				prevNode: true,
 			});
 		});
@@ -98,7 +142,10 @@ describe('BuiltInsParserState', () => {
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: 'all',
 				env: true,
-				input: true,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
 				prevNode: true,
 			});
 		});
@@ -109,7 +156,10 @@ describe('BuiltInsParserState', () => {
 			expect(state.toDataRequestParams()).toEqual({
 				dataOfNodes: 'all',
 				env: true,
-				input: true,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
 				prevNode: true,
 			});
 		});
diff --git a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser-state.ts b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser-state.ts
index 064a45df67..777738e123 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser-state.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser-state.ts
@@ -1,4 +1,5 @@
 import type { BrokerMessage } from '@/message-types';
+import type { InputDataChunkDefinition } from '@/runner-types';
 
 /**
  * Class to keep track of which built-in variables are accessed in the code
@@ -53,11 +54,16 @@ export class BuiltInsParserState {
 		this.needs$prevNode = true;
 	}
 
-	toDataRequestParams(): BrokerMessage.ToRequester.TaskDataRequest['requestParams'] {
+	toDataRequestParams(
+		chunk?: InputDataChunkDefinition,
+	): BrokerMessage.ToRequester.TaskDataRequest['requestParams'] {
 		return {
 			dataOfNodes: this.needsAllNodes ? 'all' : Array.from(this.neededNodeNames),
 			env: this.needs$env,
-			input: this.needs$input,
+			input: {
+				include: this.needs$input,
+				chunk,
+			},
 			prevNode: this.needs$prevNode,
 		};
 	}
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
index c64d58636b..005267862e 100644
--- 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
@@ -19,7 +19,12 @@ import * as a from 'node:assert';
 import { runInNewContext, type Context } from 'node:vm';
 
 import type { MainConfig } from '@/config/main-config';
-import type { DataRequestResponse, PartialAdditionalData, TaskResultData } from '@/runner-types';
+import type {
+	DataRequestResponse,
+	InputDataChunkDefinition,
+	PartialAdditionalData,
+	TaskResultData,
+} from '@/runner-types';
 import { type Task, TaskRunner } from '@/task-runner';
 
 import { BuiltInsParser } from './built-ins-parser/built-ins-parser';
@@ -37,9 +42,8 @@ export interface JSExecSettings {
 	nodeMode: CodeExecutionMode;
 	workflowMode: WorkflowExecuteMode;
 	continueOnFail: boolean;
-
-	// For workflow data proxy
-	mode: WorkflowExecuteMode;
+	// For executing partial input data
+	chunk?: InputDataChunkDefinition;
 }
 
 export interface JsTaskData {
@@ -94,6 +98,8 @@ export class JsTaskRunner extends TaskRunner {
 		const settings = task.settings;
 		a.ok(settings, 'JS Code not sent to runner');
 
+		this.validateTaskSettings(settings);
+
 		const neededBuiltInsResult = this.builtInsParser.parseUsedBuiltIns(settings.code);
 		const neededBuiltIns = neededBuiltInsResult.ok
 			? neededBuiltInsResult.result
@@ -101,10 +107,10 @@ export class JsTaskRunner extends TaskRunner {
 
 		const dataResponse = await this.requestData<DataRequestResponse>(
 			task.taskId,
-			neededBuiltIns.toDataRequestParams(),
+			neededBuiltIns.toDataRequestParams(settings.chunk),
 		);
 
-		const data = this.reconstructTaskData(dataResponse);
+		const data = this.reconstructTaskData(dataResponse, settings.chunk);
 
 		await this.requestNodeTypeIfNeeded(neededBuiltIns, data.workflow, task.taskId);
 
@@ -136,6 +142,14 @@ export class JsTaskRunner extends TaskRunner {
 		};
 	}
 
+	private validateTaskSettings(settings: JSExecSettings) {
+		a.ok(settings.code, 'No code to execute');
+
+		if (settings.nodeMode === 'runOnceForAllItems') {
+			a.ok(settings.chunk === undefined, 'Chunking is not supported for runOnceForAllItems');
+		}
+	}
+
 	private getNativeVariables() {
 		return {
 			// Exposed Node.js globals in vm2
@@ -220,7 +234,13 @@ export class JsTaskRunner extends TaskRunner {
 		const inputItems = data.connectionInputData;
 		const returnData: INodeExecutionData[] = [];
 
-		for (let index = 0; index < inputItems.length; index++) {
+		// If a chunk was requested, only process the items in the chunk
+		const chunkStartIdx = settings.chunk ? settings.chunk.startIndex : 0;
+		const chunkEndIdx = settings.chunk
+			? settings.chunk.startIndex + settings.chunk.count
+			: inputItems.length;
+
+		for (let index = chunkStartIdx; index < chunkEndIdx; index++) {
 			const item = inputItems[index];
 			const dataProxy = this.createDataProxy(data, workflow, index);
 			const context: Context = {
@@ -325,13 +345,24 @@ export class JsTaskRunner extends TaskRunner {
 		return new ExecutionError({ message: JSON.stringify(error) });
 	}
 
-	private reconstructTaskData(response: DataRequestResponse): JsTaskData {
+	private reconstructTaskData(
+		response: DataRequestResponse,
+		chunk?: InputDataChunkDefinition,
+	): JsTaskData {
+		const inputData = this.taskDataReconstruct.reconstructConnectionInputItems(
+			response.inputData,
+			chunk,
+			// This type assertion is intentional. Chunking is only supported in
+			// runOnceForEachItem mode and if a chunk was requested, we intentionally
+			// fill the array with undefined values for the items outside the chunk.
+			// We only iterate over the chunk items but WorkflowDataProxy expects
+			// the full array of items.
+		) as INodeExecutionData[];
+
 		return {
 			...response,
-			connectionInputData: this.taskDataReconstruct.reconstructConnectionInputData(
-				response.inputData,
-			),
-			executeData: this.taskDataReconstruct.reconstructExecuteData(response),
+			connectionInputData: inputData,
+			executeData: this.taskDataReconstruct.reconstructExecuteData(response, inputData),
 		};
 	}
 
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
index b7d0ffc5fc..4453521bf7 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/result-validation.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/result-validation.ts
@@ -9,7 +9,7 @@ export const REQUIRED_N8N_ITEM_KEYS = new Set(['json', 'binary', 'pairedItem', '
 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;
+			if (REQUIRED_N8N_ITEM_KEYS.has(key)) continue;
 
 			throw new ValidationError({
 				message: `Unknown top-level item key: ${key}`,
diff --git a/packages/@n8n/task-runner/src/runner-types.ts b/packages/@n8n/task-runner/src/runner-types.ts
index 4649c2cc2f..174d652e7f 100644
--- a/packages/@n8n/task-runner/src/runner-types.ts
+++ b/packages/@n8n/task-runner/src/runner-types.ts
@@ -15,6 +15,18 @@ import type {
 	WorkflowParameters,
 } from 'n8n-workflow';
 
+export interface InputDataChunkDefinition {
+	startIndex: number;
+	count: number;
+}
+
+export interface InputDataRequestParams {
+	/** Whether to include the input data in the response */
+	include: boolean;
+	/** Optionally request only a specific chunk of data instead of all input data */
+	chunk?: InputDataChunkDefinition;
+}
+
 /**
  * Specifies what data should be included for a task data request.
  */
@@ -22,7 +34,7 @@ export interface TaskDataRequestParams {
 	dataOfNodes: string[] | 'all';
 	prevNode: boolean;
 	/** Whether input data for the node should be included */
-	input: boolean;
+	input: InputDataRequestParams;
 	/** Whether env provider's state should be included */
 	env: boolean;
 }
diff --git a/packages/@n8n/task-runner/src/start.ts b/packages/@n8n/task-runner/src/start.ts
index e09ddf3332..005cbfc840 100644
--- a/packages/@n8n/task-runner/src/start.ts
+++ b/packages/@n8n/task-runner/src/start.ts
@@ -51,6 +51,9 @@ void (async function start() {
 	}
 
 	runner = new JsTaskRunner(config);
+	runner.on('runner:reached-idle-timeout', () => {
+		void createSignalHandler('IDLE_TIMEOUT')();
+	});
 
 	const { enabled, host, port } = config.baseRunnerConfig.healthcheckServer;
 
diff --git a/packages/@n8n/task-runner/src/task-runner.ts b/packages/@n8n/task-runner/src/task-runner.ts
index d1bf8a6d71..1486af280d 100644
--- a/packages/@n8n/task-runner/src/task-runner.ts
+++ b/packages/@n8n/task-runner/src/task-runner.ts
@@ -1,5 +1,6 @@
-import { ApplicationError, ensureError } from 'n8n-workflow';
+import { ApplicationError, ensureError, randomInt } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
+import { EventEmitter } from 'node:events';
 import { type MessageEvent, WebSocket } from 'ws';
 
 import type { BaseRunnerConfig } from '@/config/base-runner-config';
@@ -41,15 +42,18 @@ export interface RPCCallObject {
 	[name: string]: ((...args: unknown[]) => Promise<unknown>) | RPCCallObject;
 }
 
-const VALID_TIME_MS = 1000;
-const VALID_EXTRA_MS = 100;
+const OFFER_VALID_TIME_MS = 5000;
+const OFFER_VALID_EXTRA_MS = 100;
+
+/** Converts milliseconds to nanoseconds */
+const msToNs = (ms: number) => BigInt(ms * 1_000_000);
 
 export interface TaskRunnerOpts extends BaseRunnerConfig {
 	taskType: string;
 	name?: string;
 }
 
-export abstract class TaskRunner {
+export abstract class TaskRunner extends EventEmitter {
 	id: string = nanoid();
 
 	ws: WebSocket;
@@ -76,10 +80,17 @@ export abstract class TaskRunner {
 
 	name: string;
 
+	private idleTimer: NodeJS.Timeout | undefined;
+
+	/** How long (in seconds) a runner may be idle for before exit. */
+	private readonly idleTimeout: number;
+
 	constructor(opts: TaskRunnerOpts) {
+		super();
 		this.taskType = opts.taskType;
 		this.name = opts.name ?? 'Node.js Task Runner SDK';
 		this.maxConcurrency = opts.maxConcurrency;
+		this.idleTimeout = opts.idleTimeout;
 
 		const wsUrl = `ws://${opts.n8nUri}/runners/_ws?id=${this.id}`;
 		this.ws = new WebSocket(wsUrl, {
@@ -108,6 +119,17 @@ export abstract class TaskRunner {
 		});
 		this.ws.addEventListener('message', this.receiveMessage);
 		this.ws.addEventListener('close', this.stopTaskOffers);
+		this.resetIdleTimer();
+	}
+
+	private resetIdleTimer() {
+		if (this.idleTimeout === 0) return;
+
+		this.clearIdleTimer();
+
+		this.idleTimer = setTimeout(() => {
+			if (this.runningTasks.size === 0) this.emit('runner:reached-idle-timeout');
+		}, this.idleTimeout * 1000);
 	}
 
 	private receiveMessage = (message: MessageEvent) => {
@@ -148,16 +170,20 @@ export abstract class TaskRunner {
 			(Object.values(this.openOffers).length + Object.values(this.runningTasks).length);
 
 		for (let i = 0; i < offersToSend; i++) {
+			// Add a bit of randomness so that not all offers expire at the same time
+			const validForInMs = OFFER_VALID_TIME_MS + randomInt(500);
+			// Add a little extra time to account for latency
+			const validUntil = process.hrtime.bigint() + msToNs(validForInMs + OFFER_VALID_EXTRA_MS);
 			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
+				validUntil,
 			};
 			this.openOffers.set(offer.offerId, offer);
 			this.send({
 				type: 'runner:taskoffer',
 				taskType: this.taskType,
 				offerId: offer.offerId,
-				validFor: VALID_TIME_MS,
+				validFor: validForInMs,
 			});
 		}
 	}
@@ -244,6 +270,7 @@ export abstract class TaskRunner {
 			this.openOffers.delete(offerId);
 		}
 
+		this.resetIdleTimer();
 		this.runningTasks.set(taskId, {
 			taskId,
 			active: false,
@@ -306,6 +333,8 @@ export abstract class TaskRunner {
 			this.taskDone(taskId, data);
 		} catch (error) {
 			this.taskErrored(taskId, error);
+		} finally {
+			this.resetIdleTimer();
 		}
 	}
 
@@ -432,6 +461,8 @@ export abstract class TaskRunner {
 
 	/** Close the connection gracefully and wait until has been closed */
 	async stop() {
+		this.clearIdleTimer();
+
 		this.stopTaskOffers();
 
 		await this.waitUntilAllTasksAreDone();
@@ -439,6 +470,11 @@ export abstract class TaskRunner {
 		await this.closeConnection();
 	}
 
+	clearIdleTimer() {
+		if (this.idleTimer) clearTimeout(this.idleTimer);
+		this.idleTimer = undefined;
+	}
+
 	private async closeConnection() {
 		// 1000 is the standard close code
 		// https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 029e05e5c0..18cd195620 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.68.0",
+  "version": "1.70.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/cli/src/__tests__/wait-tracker.test.ts b/packages/cli/src/__tests__/wait-tracker.test.ts
index 66c26f00c6..49e8517272 100644
--- a/packages/cli/src/__tests__/wait-tracker.test.ts
+++ b/packages/cli/src/__tests__/wait-tracker.test.ts
@@ -1,33 +1,46 @@
 import { mock } from 'jest-mock-extended';
 import type { InstanceSettings } from 'n8n-core';
+import type { IWorkflowBase } from 'n8n-workflow';
 
+import type { Project } from '@/databases/entities/project';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type { IExecutionResponse } from '@/interfaces';
 import type { MultiMainSetup } from '@/scaling/multi-main-setup.ee';
 import { OrchestrationService } from '@/services/orchestration.service';
+import type { OwnershipService } from '@/services/ownership.service';
 import { WaitTracker } from '@/wait-tracker';
+import type { WorkflowRunner } from '@/workflow-runner';
 import { mockLogger } from '@test/mocking';
 
 jest.useFakeTimers();
 
 describe('WaitTracker', () => {
+	const ownershipService = mock<OwnershipService>();
+	const workflowRunner = mock<WorkflowRunner>();
 	const executionRepository = mock<ExecutionRepository>();
 	const multiMainSetup = mock<MultiMainSetup>();
 	const orchestrationService = new OrchestrationService(mock(), multiMainSetup, mock());
 	const instanceSettings = mock<InstanceSettings>({ isLeader: true });
 
+	const project = mock<Project>({ id: 'projectId' });
 	const execution = mock<IExecutionResponse>({
 		id: '123',
+		finished: false,
 		waitTill: new Date(Date.now() + 1000),
+		mode: 'manual',
+		data: mock({
+			pushRef: 'push_ref',
+		}),
 	});
+	execution.workflowData = mock<IWorkflowBase>({ id: 'abcd' });
 
 	let waitTracker: WaitTracker;
 	beforeEach(() => {
 		waitTracker = new WaitTracker(
 			mockLogger(),
 			executionRepository,
-			mock(),
-			mock(),
+			ownershipService,
+			workflowRunner,
 			orchestrationService,
 			instanceSettings,
 		);
@@ -64,29 +77,31 @@ describe('WaitTracker', () => {
 		});
 
 		describe('if execution to start', () => {
-			it('if not enough time passed, should not start execution', async () => {
+			let startExecutionSpy: jest.SpyInstance<Promise<void>, [executionId: string]>;
+
+			beforeEach(() => {
+				executionRepository.findSingleExecution.mockResolvedValue(execution);
 				executionRepository.getWaitingExecutions.mockResolvedValue([execution]);
+				ownershipService.getWorkflowProjectCached.mockResolvedValue(project);
+
+				startExecutionSpy = jest
+					.spyOn(waitTracker, 'startExecution')
+					.mockImplementation(async () => {});
+
 				waitTracker.init();
+			});
 
-				executionRepository.getWaitingExecutions.mockResolvedValue([execution]);
+			it('if not enough time passed, should not start execution', async () => {
 				await waitTracker.getWaitingExecutions();
 
-				const startExecutionSpy = jest.spyOn(waitTracker, 'startExecution');
-
 				jest.advanceTimersByTime(100);
 
 				expect(startExecutionSpy).not.toHaveBeenCalled();
 			});
 
 			it('if enough time passed, should start execution', async () => {
-				executionRepository.getWaitingExecutions.mockResolvedValue([]);
-				waitTracker.init();
-
-				executionRepository.getWaitingExecutions.mockResolvedValue([execution]);
 				await waitTracker.getWaitingExecutions();
 
-				const startExecutionSpy = jest.spyOn(waitTracker, 'startExecution');
-
 				jest.advanceTimersByTime(2_000);
 
 				expect(startExecutionSpy).toHaveBeenCalledWith(execution.id);
@@ -100,13 +115,27 @@ describe('WaitTracker', () => {
 			waitTracker.init();
 
 			executionRepository.findSingleExecution.mockResolvedValue(execution);
-			waitTracker.startExecution(execution.id);
-			jest.advanceTimersByTime(5);
+			ownershipService.getWorkflowProjectCached.mockResolvedValue(project);
+
+			await waitTracker.startExecution(execution.id);
 
 			expect(executionRepository.findSingleExecution).toHaveBeenCalledWith(execution.id, {
 				includeData: true,
 				unflattenData: true,
 			});
+
+			expect(workflowRunner.run).toHaveBeenCalledWith(
+				{
+					executionMode: execution.mode,
+					executionData: execution.data,
+					workflowData: execution.workflowData,
+					projectId: project.id,
+					pushRef: execution.data.pushRef,
+				},
+				false,
+				false,
+				execution.id,
+			);
 		});
 	});
 
@@ -135,8 +164,8 @@ describe('WaitTracker', () => {
 			const waitTracker = new WaitTracker(
 				mockLogger(),
 				executionRepository,
-				mock(),
-				mock(),
+				ownershipService,
+				workflowRunner,
 				orchestrationService,
 				mock<InstanceSettings>({ isLeader: false }),
 			);
diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index 214d7f4ce7..b8f15d9f33 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -21,6 +21,7 @@ import { LICENSE_FEATURES, inDevelopment, inTest } from '@/constants';
 import * as CrashJournal from '@/crash-journal';
 import * as Db from '@/db';
 import { getDataDeduplicationService } from '@/deduplication';
+import { DeprecationService } from '@/deprecation/deprecation.service';
 import { initErrorHandling } from '@/error-reporting';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay';
@@ -88,33 +89,14 @@ export abstract class BaseCommand extends Command {
 				await this.exitWithCrash('There was an error running database migrations', error),
 		);
 
-		const { type: dbType } = this.globalConfig.database;
-
-		if (['mysqldb', 'mariadb'].includes(dbType)) {
-			this.logger.warn(
-				'Support for MySQL/MariaDB has been deprecated and will be removed with an upcoming version of n8n. Please migrate to PostgreSQL.',
-			);
-		}
-
-		if (process.env.N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN) {
-			this.logger.warn(
-				'The flag to skip webhook deregistration N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN has been removed. n8n no longer deregisters webhooks at startup and shutdown, in main and queue mode.',
-			);
-		}
-
-		if (config.getEnv('executions.mode') === 'queue' && dbType === 'sqlite') {
-			this.logger.warn(
-				'Queue mode is not officially supported with sqlite. Please switch to PostgreSQL.',
-			);
-		}
+		Container.get(DeprecationService).warn();
 
 		if (
-			process.env.N8N_BINARY_DATA_TTL ??
-			process.env.N8N_PERSISTED_BINARY_DATA_TTL ??
-			process.env.EXECUTIONS_DATA_PRUNE_TIMEOUT
+			config.getEnv('executions.mode') === 'queue' &&
+			this.globalConfig.database.type === 'sqlite'
 		) {
 			this.logger.warn(
-				'The env vars N8N_BINARY_DATA_TTL and N8N_PERSISTED_BINARY_DATA_TTL and EXECUTIONS_DATA_PRUNE_TIMEOUT no longer have any effect and can be safely removed. Instead of relying on a TTL system for binary data, n8n currently cleans up binary data together with executions during pruning.',
+				'Scaling mode is not officially supported with sqlite. Please use PostgreSQL instead.',
 			);
 		}
 
diff --git a/packages/cli/src/commands/execute-batch.ts b/packages/cli/src/commands/execute-batch.ts
index fbbecd2cbb..a70717c40b 100644
--- a/packages/cli/src/commands/execute-batch.ts
+++ b/packages/cli/src/commands/execute-batch.ts
@@ -4,7 +4,7 @@ import fs from 'fs';
 import { diff } from 'json-diff';
 import pick from 'lodash/pick';
 import type { IRun, ITaskData, IWorkflowExecutionDataProcess } from 'n8n-workflow';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { ApplicationError, jsonParse, ErrorReporterProxy } from 'n8n-workflow';
 import os from 'os';
 import { sep } from 'path';
 import { Container } from 'typedi';
@@ -822,6 +822,11 @@ export class ExecuteBatch extends BaseCommand {
 					}
 				}
 			} catch (e) {
+				ErrorReporterProxy.error(e, {
+					extra: {
+						workflowId: workflowData.id,
+					},
+				});
 				executionResult.error = `Workflow failed to execute: ${(e as Error).message}`;
 				executionResult.executionStatus = 'error';
 			}
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 54fa07e7f5..1891d8193d 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -405,4 +405,11 @@ export const schema = {
 			doc: 'Set this to 1 to enable the new partial execution logic by default.',
 		},
 	},
+
+	virtualSchemaView: {
+		doc: 'Whether to display the virtualized schema view',
+		format: Boolean,
+		default: false,
+		env: 'N8N_VIRTUAL_SCHEMA_VIEW',
+	},
 };
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index df52a36b96..78d7671e1b 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -164,3 +164,13 @@ 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;
+
+export const WsStatusCodes = {
+	CloseNormal: 1000,
+	CloseGoingAway: 1001,
+	CloseProtocolError: 1002,
+	CloseUnsupportedData: 1003,
+	CloseNoStatus: 1005,
+	CloseAbnormal: 1006,
+	CloseInvalidData: 1007,
+} as const;
diff --git a/packages/cli/src/credentials-helper.ts b/packages/cli/src/credentials-helper.ts
index e57ad2c6d3..967ee9efe4 100644
--- a/packages/cli/src/credentials-helper.ts
+++ b/packages/cli/src/credentials-helper.ts
@@ -4,7 +4,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
-import { Credentials, NodeExecuteFunctions } from 'n8n-core';
+import { Credentials, getAdditionalKeys } from 'n8n-core';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsExpressionResolveValues,
@@ -379,7 +379,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 			decryptedData.oauthTokenData = decryptedDataOriginal.oauthTokenData;
 		}
 
-		const additionalKeys = NodeExecuteFunctions.getAdditionalKeys(additionalData, mode, null, {
+		const additionalKeys = getAdditionalKeys(additionalData, mode, null, {
 			secretsEnabled: canUseSecrets,
 		});
 
diff --git a/packages/cli/src/databases/entities/index.ts b/packages/cli/src/databases/entities/index.ts
index be73a0ed63..e6a1dedb3f 100644
--- a/packages/cli/src/databases/entities/index.ts
+++ b/packages/cli/src/databases/entities/index.ts
@@ -21,6 +21,8 @@ import { SharedCredentials } from './shared-credentials';
 import { SharedWorkflow } from './shared-workflow';
 import { TagEntity } from './tag-entity';
 import { TestDefinition } from './test-definition.ee';
+import { TestMetric } from './test-metric.ee';
+import { TestRun } from './test-run.ee';
 import { User } from './user';
 import { Variables } from './variables';
 import { WebhookEntity } from './webhook-entity';
@@ -60,4 +62,6 @@ export const entities = {
 	ApiKey,
 	ProcessedData,
 	TestDefinition,
+	TestMetric,
+	TestRun,
 };
diff --git a/packages/cli/src/databases/entities/test-definition.ee.ts b/packages/cli/src/databases/entities/test-definition.ee.ts
index dd39ebef02..77f8ca2bdc 100644
--- a/packages/cli/src/databases/entities/test-definition.ee.ts
+++ b/packages/cli/src/databases/entities/test-definition.ee.ts
@@ -1,7 +1,8 @@
-import { Column, Entity, Index, ManyToOne, RelationId } from '@n8n/typeorm';
+import { Column, Entity, Index, ManyToOne, OneToMany, RelationId } from '@n8n/typeorm';
 import { Length } from 'class-validator';
 
 import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
+import type { TestMetric } from '@/databases/entities/test-metric.ee';
 import { WorkflowEntity } from '@/databases/entities/workflow-entity';
 
 import { WithTimestampsAndStringId } from './abstract-entity';
@@ -53,4 +54,7 @@ export class TestDefinition extends WithTimestampsAndStringId {
 
 	@RelationId((test: TestDefinition) => test.annotationTag)
 	annotationTagId: string;
+
+	@OneToMany('TestMetric', 'testDefinition')
+	metrics: TestMetric[];
 }
diff --git a/packages/cli/src/databases/entities/test-metric.ee.ts b/packages/cli/src/databases/entities/test-metric.ee.ts
new file mode 100644
index 0000000000..bc3dc07f7a
--- /dev/null
+++ b/packages/cli/src/databases/entities/test-metric.ee.ts
@@ -0,0 +1,29 @@
+import { Column, Entity, Index, ManyToOne } from '@n8n/typeorm';
+import { Length } from 'class-validator';
+
+import { WithTimestampsAndStringId } from '@/databases/entities/abstract-entity';
+import { TestDefinition } from '@/databases/entities/test-definition.ee';
+
+/**
+ * Entity representing a Test Metric
+ * It represents a single metric that can be retrieved from evaluation workflow execution result
+ */
+@Entity()
+@Index(['testDefinition'])
+export class TestMetric extends WithTimestampsAndStringId {
+	/**
+	 * Name of the metric.
+	 * This will be used as a property name to extract metric value from the evaluation workflow execution result object
+	 */
+	@Column({ length: 255 })
+	@Length(1, 255, {
+		message: 'Metric name must be $constraint1 to $constraint2 characters long.',
+	})
+	name: string;
+
+	/**
+	 * Relation to test definition
+	 */
+	@ManyToOne('TestDefinition', 'metrics')
+	testDefinition: TestDefinition;
+}
diff --git a/packages/cli/src/databases/entities/test-run.ee.ts b/packages/cli/src/databases/entities/test-run.ee.ts
new file mode 100644
index 0000000000..ab5f041f11
--- /dev/null
+++ b/packages/cli/src/databases/entities/test-run.ee.ts
@@ -0,0 +1,38 @@
+import { Column, Entity, Index, ManyToOne, RelationId } from '@n8n/typeorm';
+
+import {
+	datetimeColumnType,
+	jsonColumnType,
+	WithTimestampsAndStringId,
+} from '@/databases/entities/abstract-entity';
+import { TestDefinition } from '@/databases/entities/test-definition.ee';
+
+type TestRunStatus = 'new' | 'running' | 'completed' | 'error';
+
+export type AggregatedTestRunMetrics = Record<string, number | boolean>;
+
+/**
+ * Entity representing a Test Run.
+ * It stores info about a specific run of a test, combining the test definition with the status and collected metrics
+ */
+@Entity()
+@Index(['testDefinition'])
+export class TestRun extends WithTimestampsAndStringId {
+	@ManyToOne('TestDefinition', 'runs')
+	testDefinition: TestDefinition;
+
+	@RelationId((testRun: TestRun) => testRun.testDefinition)
+	testDefinitionId: string;
+
+	@Column('varchar')
+	status: TestRunStatus;
+
+	@Column({ type: datetimeColumnType, nullable: true })
+	runAt: Date | null;
+
+	@Column({ type: datetimeColumnType, nullable: true })
+	completedAt: Date | null;
+
+	@Column(jsonColumnType, { nullable: true })
+	metrics: AggregatedTestRunMetrics;
+}
diff --git a/packages/cli/src/databases/migrations/common/1732271325258-CreateTestMetricTable.ts b/packages/cli/src/databases/migrations/common/1732271325258-CreateTestMetricTable.ts
new file mode 100644
index 0000000000..33460d8fb1
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1732271325258-CreateTestMetricTable.ts
@@ -0,0 +1,24 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+const testMetricEntityTableName = 'test_metric';
+
+export class CreateTestMetricTable1732271325258 implements ReversibleMigration {
+	async up({ schemaBuilder: { createTable, column } }: MigrationContext) {
+		await createTable(testMetricEntityTableName)
+			.withColumns(
+				column('id').varchar(36).primary.notNull,
+				column('name').varchar(255).notNull,
+				column('testDefinitionId').varchar(36).notNull,
+			)
+			.withIndexOn('testDefinitionId')
+			.withForeignKey('testDefinitionId', {
+				tableName: 'test_definition',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			}).withTimestamps;
+	}
+
+	async down({ schemaBuilder: { dropTable } }: MigrationContext) {
+		await dropTable(testMetricEntityTableName);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1732549866705-CreateTestRunTable.ts b/packages/cli/src/databases/migrations/common/1732549866705-CreateTestRunTable.ts
new file mode 100644
index 0000000000..e9dc0ba823
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1732549866705-CreateTestRunTable.ts
@@ -0,0 +1,27 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+const testRunTableName = 'test_run';
+
+export class CreateTestRun1732549866705 implements ReversibleMigration {
+	async up({ schemaBuilder: { createTable, column } }: MigrationContext) {
+		await createTable(testRunTableName)
+			.withColumns(
+				column('id').varchar(36).primary.notNull,
+				column('testDefinitionId').varchar(36).notNull,
+				column('status').varchar().notNull,
+				column('runAt').timestamp(),
+				column('completedAt').timestamp(),
+				column('metrics').json,
+			)
+			.withIndexOn('testDefinitionId')
+			.withForeignKey('testDefinitionId', {
+				tableName: 'test_definition',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			}).withTimestamps;
+	}
+
+	async down({ schemaBuilder: { dropTable } }: MigrationContext) {
+		await dropTable(testRunTableName);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 4b219e9a26..d962042333 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -71,6 +71,8 @@ import { AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644 } from '../comm
 import { UpdateProcessedDataValueColumnToText1729607673464 } from '../common/1729607673464-UpdateProcessedDataValueColumnToText';
 import { CreateTestDefinitionTable1730386903556 } from '../common/1730386903556-CreateTestDefinitionTable';
 import { AddDescriptionToTestDefinition1731404028106 } from '../common/1731404028106-AddDescriptionToTestDefinition';
+import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-CreateTestMetricTable';
+import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -144,4 +146,6 @@ export const mysqlMigrations: Migration[] = [
 	CreateTestDefinitionTable1730386903556,
 	AddDescriptionToTestDefinition1731404028106,
 	MigrateTestDefinitionKeyToString1731582748663,
+	CreateTestMetricTable1732271325258,
+	CreateTestRun1732549866705,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 689840b937..012b18e31d 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -71,6 +71,8 @@ import { AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644 } from '../comm
 import { UpdateProcessedDataValueColumnToText1729607673464 } from '../common/1729607673464-UpdateProcessedDataValueColumnToText';
 import { CreateTestDefinitionTable1730386903556 } from '../common/1730386903556-CreateTestDefinitionTable';
 import { AddDescriptionToTestDefinition1731404028106 } from '../common/1731404028106-AddDescriptionToTestDefinition';
+import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-CreateTestMetricTable';
+import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -144,4 +146,6 @@ export const postgresMigrations: Migration[] = [
 	CreateTestDefinitionTable1730386903556,
 	AddDescriptionToTestDefinition1731404028106,
 	MigrateTestDefinitionKeyToString1731582748663,
+	CreateTestMetricTable1732271325258,
+	CreateTestRun1732549866705,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 5c7c6d9a07..7c8fcbf86f 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -68,6 +68,8 @@ import { CreateProcessedDataTable1726606152711 } from '../common/1726606152711-C
 import { SeparateExecutionCreationFromStart1727427440136 } from '../common/1727427440136-SeparateExecutionCreationFromStart';
 import { UpdateProcessedDataValueColumnToText1729607673464 } from '../common/1729607673464-UpdateProcessedDataValueColumnToText';
 import { CreateTestDefinitionTable1730386903556 } from '../common/1730386903556-CreateTestDefinitionTable';
+import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-CreateTestMetricTable';
+import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -138,6 +140,8 @@ const sqliteMigrations: Migration[] = [
 	CreateTestDefinitionTable1730386903556,
 	AddDescriptionToTestDefinition1731404028106,
 	MigrateTestDefinitionKeyToString1731582748663,
+	CreateTestMetricTable1732271325258,
+	CreateTestRun1732549866705,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index b37d118f3c..5bef675a79 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -163,7 +163,13 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			if (!queryParams.relations) {
 				queryParams.relations = [];
 			}
-			(queryParams.relations as string[]).push('executionData', 'metadata');
+
+			if (Array.isArray(queryParams.relations)) {
+				queryParams.relations.push('executionData', 'metadata');
+			} else {
+				queryParams.relations.executionData = true;
+				queryParams.relations.metadata = true;
+			}
 		}
 
 		const executions = await this.find(queryParams);
@@ -981,7 +987,7 @@ 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 });
+				.andWhere('sw.projectId = :projectId', { projectId });
 		}
 
 		return qb;
diff --git a/packages/cli/src/databases/repositories/test-definition.repository.ee.ts b/packages/cli/src/databases/repositories/test-definition.repository.ee.ts
index ecd4bdde34..6866608b02 100644
--- a/packages/cli/src/databases/repositories/test-definition.repository.ee.ts
+++ b/packages/cli/src/databases/repositories/test-definition.repository.ee.ts
@@ -3,6 +3,7 @@ import { DataSource, In, Repository } from '@n8n/typeorm';
 import { Service } from 'typedi';
 
 import { TestDefinition } from '@/databases/entities/test-definition.ee';
+import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import type { ListQuery } from '@/requests';
 
 @Service()
@@ -14,12 +15,21 @@ export class TestDefinitionRepository extends Repository<TestDefinition> {
 	async getMany(accessibleWorkflowIds: string[], options?: ListQuery.Options) {
 		if (accessibleWorkflowIds.length === 0) return { tests: [], count: 0 };
 
-		const where: FindOptionsWhere<TestDefinition> = {
-			...options?.filter,
-			workflow: {
+		const where: FindOptionsWhere<TestDefinition> = {};
+
+		if (options?.filter?.workflowId) {
+			if (!accessibleWorkflowIds.includes(options.filter.workflowId as string)) {
+				throw new ForbiddenError('User does not have access to the workflow');
+			}
+
+			where.workflow = {
+				id: options.filter.workflowId as string,
+			};
+		} else {
+			where.workflow = {
 				id: In(accessibleWorkflowIds),
-			},
-		};
+			};
+		}
 
 		const findManyOptions: FindManyOptions<TestDefinition> = {
 			where,
@@ -45,7 +55,7 @@ export class TestDefinitionRepository extends Repository<TestDefinition> {
 					id: In(accessibleWorkflowIds),
 				},
 			},
-			relations: ['annotationTag'],
+			relations: ['annotationTag', 'metrics'],
 		});
 	}
 
diff --git a/packages/cli/src/databases/repositories/test-metric.repository.ee.ts b/packages/cli/src/databases/repositories/test-metric.repository.ee.ts
new file mode 100644
index 0000000000..01635ef8f7
--- /dev/null
+++ b/packages/cli/src/databases/repositories/test-metric.repository.ee.ts
@@ -0,0 +1,11 @@
+import { DataSource, Repository } from '@n8n/typeorm';
+import { Service } from 'typedi';
+
+import { TestMetric } from '@/databases/entities/test-metric.ee';
+
+@Service()
+export class TestMetricRepository extends Repository<TestMetric> {
+	constructor(dataSource: DataSource) {
+		super(TestMetric, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/databases/repositories/test-run.repository.ee.ts b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
new file mode 100644
index 0000000000..e8e2a1a5ef
--- /dev/null
+++ b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
@@ -0,0 +1,29 @@
+import { DataSource, Repository } from '@n8n/typeorm';
+import { Service } from 'typedi';
+
+import type { AggregatedTestRunMetrics } from '@/databases/entities/test-run.ee';
+import { TestRun } from '@/databases/entities/test-run.ee';
+
+@Service()
+export class TestRunRepository extends Repository<TestRun> {
+	constructor(dataSource: DataSource) {
+		super(TestRun, dataSource.manager);
+	}
+
+	public async createTestRun(testDefinitionId: string) {
+		const testRun = this.create({
+			status: 'new',
+			testDefinition: { id: testDefinitionId },
+		});
+
+		return await this.save(testRun);
+	}
+
+	public async markAsRunning(id: string) {
+		return await this.update(id, { status: 'running', runAt: new Date() });
+	}
+
+	public async markAsCompleted(id: string, metrics: AggregatedTestRunMetrics) {
+		return await this.update(id, { status: 'completed', completedAt: new Date(), metrics });
+	}
+}
diff --git a/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts b/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts
new file mode 100644
index 0000000000..42b8b315ba
--- /dev/null
+++ b/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts
@@ -0,0 +1,41 @@
+import { mockLogger } from '@test/mocking';
+
+import { DeprecationService } from '../deprecation.service';
+
+describe('DeprecationService', () => {
+	const toTest = (envVar: string, value: string, inUse: boolean) => {
+		process.env[envVar] = value;
+		const deprecationService = new DeprecationService(mockLogger());
+
+		deprecationService.warn();
+
+		expect(deprecationService.isInUse(envVar)).toBe(inUse);
+	};
+
+	test.each([
+		['N8N_BINARY_DATA_TTL', '1', true],
+		['N8N_PERSISTED_BINARY_DATA_TTL', '1', true],
+		['EXECUTIONS_DATA_PRUNE_TIMEOUT', '1', true],
+		['N8N_CONFIG_FILES', '1', true],
+		['N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN', '1', true],
+	])('should detect when %s is in use', (envVar, value, inUse) => {
+		toTest(envVar, value, inUse);
+	});
+
+	test.each([
+		['default', true],
+		['filesystem', false],
+		['s3', false],
+	])('should handle N8N_BINARY_DATA_MODE as %s', (mode, inUse) => {
+		toTest('N8N_BINARY_DATA_MODE', mode, inUse);
+	});
+
+	test.each([
+		['sqlite', false],
+		['postgresdb', false],
+		['mysqldb', true],
+		['mariadb', true],
+	])('should handle DB_TYPE as %s', (dbType, inUse) => {
+		toTest('DB_TYPE', dbType, inUse);
+	});
+});
diff --git a/packages/cli/src/deprecation/deprecation.service.ts b/packages/cli/src/deprecation/deprecation.service.ts
new file mode 100644
index 0000000000..fef25ff0dd
--- /dev/null
+++ b/packages/cli/src/deprecation/deprecation.service.ts
@@ -0,0 +1,85 @@
+import { ApplicationError } from 'n8n-workflow';
+import { Service } from 'typedi';
+
+import { Logger } from '@/logging/logger.service';
+
+type EnvVarName = string;
+
+type Deprecation = {
+	/** Name of the deprecated env var. */
+	envVar: EnvVarName;
+
+	/** Message to display when the deprecated env var is currently in use. */
+	message: string;
+
+	/** Function to identify the specific value in the env var that is deprecated. */
+	checkValue?: (value: string) => boolean;
+};
+
+const SAFE_TO_REMOVE = 'Remove this environment variable; it is no longer needed.';
+
+/** Responsible for warning about use of deprecated env vars. */
+@Service()
+export class DeprecationService {
+	private readonly deprecations: Deprecation[] = [
+		{ envVar: 'N8N_BINARY_DATA_TTL', message: SAFE_TO_REMOVE },
+		{ envVar: 'N8N_PERSISTED_BINARY_DATA_TTL', message: SAFE_TO_REMOVE },
+		{ envVar: 'EXECUTIONS_DATA_PRUNE_TIMEOUT', message: SAFE_TO_REMOVE },
+		{
+			envVar: 'N8N_BINARY_DATA_MODE',
+			message: '`default` is deprecated. Please switch to `filesystem` mode.',
+			checkValue: (value: string) => value === 'default',
+		},
+		{ envVar: 'N8N_CONFIG_FILES', message: 'Please use .env files or *_FILE env vars instead.' },
+		{
+			envVar: 'DB_TYPE',
+			message: 'MySQL and MariaDB are deprecated. Please migrate to PostgreSQL.',
+			checkValue: (value: string) => ['mysqldb', 'mariadb'].includes(value),
+		},
+		{
+			envVar: 'N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN',
+			message: `n8n no longer deregisters webhooks at startup and shutdown. ${SAFE_TO_REMOVE}`,
+		},
+	];
+
+	/** Runtime state of deprecated env vars. */
+	private readonly state: Record<EnvVarName, { inUse: boolean }> = {};
+
+	constructor(private readonly logger: Logger) {}
+
+	warn() {
+		this.deprecations.forEach((d) => {
+			const envValue = process.env[d.envVar];
+			this.state[d.envVar] = {
+				inUse: d.checkValue
+					? envValue !== undefined && d.checkValue(envValue)
+					: envValue !== undefined,
+			};
+		});
+
+		const inUse = Object.entries(this.state)
+			.filter(([, d]) => d.inUse)
+			.map(([envVar]) => {
+				const deprecation = this.deprecations.find((d) => d.envVar === envVar);
+				if (!deprecation) {
+					throw new ApplicationError(`Deprecation not found for env var: ${envVar}`);
+				}
+				return deprecation;
+			});
+
+		if (inUse.length === 0) return;
+
+		const header = `The following environment variable${
+			inUse.length === 1 ? ' is' : 's are'
+		} deprecated and will be removed in an upcoming version of n8n. Please take the recommended actions to update your configuration`;
+		const deprecations = inUse
+			.map(({ envVar, message }) => ` - ${envVar} -> ${message}\n`)
+			.join('');
+
+		this.logger.warn(`\n${header}:\n${deprecations}`);
+	}
+
+	isInUse(envVar: string) {
+		return this.state[envVar]?.inUse ?? false;
+	}
+}
diff --git a/packages/cli/src/evaluation/metric.schema.ts b/packages/cli/src/evaluation/metric.schema.ts
new file mode 100644
index 0000000000..fb186c50df
--- /dev/null
+++ b/packages/cli/src/evaluation/metric.schema.ts
@@ -0,0 +1,13 @@
+import { z } from 'zod';
+
+export const testMetricCreateRequestBodySchema = z
+	.object({
+		name: z.string().min(1).max(255),
+	})
+	.strict();
+
+export const testMetricPatchRequestBodySchema = z
+	.object({
+		name: z.string().min(1).max(255),
+	})
+	.strict();
diff --git a/packages/cli/src/evaluation/metrics.controller.ts b/packages/cli/src/evaluation/metrics.controller.ts
new file mode 100644
index 0000000000..af8f5c0408
--- /dev/null
+++ b/packages/cli/src/evaluation/metrics.controller.ts
@@ -0,0 +1,130 @@
+import express from 'express';
+
+import { TestMetricRepository } from '@/databases/repositories/test-metric.repository.ee';
+import { Delete, Get, Patch, Post, RestController } from '@/decorators';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import {
+	testMetricCreateRequestBodySchema,
+	testMetricPatchRequestBodySchema,
+} from '@/evaluation/metric.schema';
+import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service';
+
+import { TestDefinitionService } from './test-definition.service.ee';
+import { TestMetricsRequest } from './test-definitions.types.ee';
+
+@RestController('/evaluation/test-definitions')
+export class TestMetricsController {
+	constructor(
+		private readonly testDefinitionService: TestDefinitionService,
+		private readonly testMetricRepository: TestMetricRepository,
+	) {}
+
+	// This method is used in multiple places in the controller to get the test definition
+	// (or just check that it exists and the user has access to it).
+	private async getTestDefinition(
+		req:
+			| TestMetricsRequest.GetOne
+			| TestMetricsRequest.GetMany
+			| TestMetricsRequest.Patch
+			| TestMetricsRequest.Delete
+			| TestMetricsRequest.Create,
+	) {
+		const { testDefinitionId } = req.params;
+
+		const userAccessibleWorkflowIds = await getSharedWorkflowIds(req.user, ['workflow:read']);
+
+		const testDefinition = await this.testDefinitionService.findOne(
+			testDefinitionId,
+			userAccessibleWorkflowIds,
+		);
+
+		if (!testDefinition) throw new NotFoundError('Test definition not found');
+
+		return testDefinition;
+	}
+
+	@Get('/:testDefinitionId/metrics')
+	async getMany(req: TestMetricsRequest.GetMany) {
+		const { testDefinitionId } = req.params;
+
+		await this.getTestDefinition(req);
+
+		return await this.testMetricRepository.find({
+			where: { testDefinition: { id: testDefinitionId } },
+		});
+	}
+
+	@Get('/:testDefinitionId/metrics/:id')
+	async getOne(req: TestMetricsRequest.GetOne) {
+		const { id: metricId, testDefinitionId } = req.params;
+
+		await this.getTestDefinition(req);
+
+		const metric = await this.testMetricRepository.findOne({
+			where: { id: metricId, testDefinition: { id: testDefinitionId } },
+		});
+
+		if (!metric) throw new NotFoundError('Metric not found');
+
+		return metric;
+	}
+
+	@Post('/:testDefinitionId/metrics')
+	async create(req: TestMetricsRequest.Create, res: express.Response) {
+		const bodyParseResult = testMetricCreateRequestBodySchema.safeParse(req.body);
+		if (!bodyParseResult.success) {
+			res.status(400).json({ errors: bodyParseResult.error.errors });
+			return;
+		}
+
+		const testDefinition = await this.getTestDefinition(req);
+
+		const metric = this.testMetricRepository.create({
+			...req.body,
+			testDefinition,
+		});
+
+		return await this.testMetricRepository.save(metric);
+	}
+
+	@Patch('/:testDefinitionId/metrics/:id')
+	async patch(req: TestMetricsRequest.Patch, res: express.Response) {
+		const { id: metricId, testDefinitionId } = req.params;
+
+		const bodyParseResult = testMetricPatchRequestBodySchema.safeParse(req.body);
+		if (!bodyParseResult.success) {
+			res.status(400).json({ errors: bodyParseResult.error.errors });
+			return;
+		}
+
+		await this.getTestDefinition(req);
+
+		const metric = await this.testMetricRepository.findOne({
+			where: { id: metricId, testDefinition: { id: testDefinitionId } },
+		});
+
+		if (!metric) throw new NotFoundError('Metric not found');
+
+		await this.testMetricRepository.update(metricId, bodyParseResult.data);
+
+		// Respond with the updated metric
+		return await this.testMetricRepository.findOneBy({ id: metricId });
+	}
+
+	@Delete('/:testDefinitionId/metrics/:id')
+	async delete(req: TestMetricsRequest.GetOne) {
+		const { id: metricId, testDefinitionId } = req.params;
+
+		await this.getTestDefinition(req);
+
+		const metric = await this.testMetricRepository.findOne({
+			where: { id: metricId, testDefinition: { id: testDefinitionId } },
+		});
+
+		if (!metric) throw new NotFoundError('Metric not found');
+
+		await this.testMetricRepository.delete(metricId);
+
+		return { success: true };
+	}
+}
diff --git a/packages/cli/src/evaluation/test-definition.service.ee.ts b/packages/cli/src/evaluation/test-definition.service.ee.ts
index d32a2e153d..55b7339ebe 100644
--- a/packages/cli/src/evaluation/test-definition.service.ee.ts
+++ b/packages/cli/src/evaluation/test-definition.service.ee.ts
@@ -10,7 +10,7 @@ import type { ListQuery } from '@/requests';
 
 type TestDefinitionLike = Omit<
 	Partial<TestDefinition>,
-	'workflow' | 'evaluationWorkflow' | 'annotationTag'
+	'workflow' | 'evaluationWorkflow' | 'annotationTag' | 'metrics'
 > & {
 	workflow?: { id: string };
 	evaluationWorkflow?: { id: string };
diff --git a/packages/cli/src/evaluation/test-definitions.controller.ee.ts b/packages/cli/src/evaluation/test-definitions.controller.ee.ts
index eaa7745c51..ef4a3ed461 100644
--- a/packages/cli/src/evaluation/test-definitions.controller.ee.ts
+++ b/packages/cli/src/evaluation/test-definitions.controller.ee.ts
@@ -8,6 +8,7 @@ import {
 	testDefinitionCreateRequestBodySchema,
 	testDefinitionPatchRequestBodySchema,
 } from '@/evaluation/test-definition.schema';
+import { TestRunnerService } from '@/evaluation/test-runner/test-runner.service.ee';
 import { listQueryMiddleware } from '@/middlewares';
 import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service';
 
@@ -16,7 +17,10 @@ import { TestDefinitionsRequest } from './test-definitions.types.ee';
 
 @RestController('/evaluation/test-definitions')
 export class TestDefinitionsController {
-	constructor(private readonly testDefinitionService: TestDefinitionService) {}
+	constructor(
+		private readonly testDefinitionService: TestDefinitionService,
+		private readonly testRunnerService: TestRunnerService,
+	) {}
 
 	@Get('/', { middlewares: listQueryMiddleware })
 	async getMany(req: TestDefinitionsRequest.GetMany) {
@@ -125,4 +129,20 @@ export class TestDefinitionsController {
 
 		return testDefinition;
 	}
+
+	@Post('/:id/run')
+	async runTest(req: TestDefinitionsRequest.Run, res: express.Response) {
+		const { id: testDefinitionId } = req.params;
+
+		const workflowIds = await getSharedWorkflowIds(req.user, ['workflow:read']);
+
+		// Check test definition exists
+		const testDefinition = await this.testDefinitionService.findOne(testDefinitionId, workflowIds);
+		if (!testDefinition) throw new NotFoundError('Test definition not found');
+
+		// We do not await for the test run to complete
+		void this.testRunnerService.runTest(req.user, testDefinition);
+
+		res.status(202).json({ success: true });
+	}
 }
diff --git a/packages/cli/src/evaluation/test-definitions.types.ee.ts b/packages/cli/src/evaluation/test-definitions.types.ee.ts
index 2814e6bb7f..939a37b949 100644
--- a/packages/cli/src/evaluation/test-definitions.types.ee.ts
+++ b/packages/cli/src/evaluation/test-definitions.types.ee.ts
@@ -30,4 +30,36 @@ export declare namespace TestDefinitionsRequest {
 	>;
 
 	type Delete = AuthenticatedRequest<RouteParams.TestId>;
+
+	type Run = AuthenticatedRequest<RouteParams.TestId>;
+}
+
+// ----------------------------------
+//             /test-definitions/:testDefinitionId/metrics
+// ----------------------------------
+
+export declare namespace TestMetricsRequest {
+	namespace RouteParams {
+		type TestDefinitionId = {
+			testDefinitionId: string;
+		};
+
+		type TestMetricId = {
+			id: string;
+		};
+	}
+
+	type GetOne = AuthenticatedRequest<RouteParams.TestDefinitionId & RouteParams.TestMetricId>;
+
+	type GetMany = AuthenticatedRequest<RouteParams.TestDefinitionId>;
+
+	type Create = AuthenticatedRequest<RouteParams.TestDefinitionId, {}, { name: string }>;
+
+	type Patch = AuthenticatedRequest<
+		RouteParams.TestDefinitionId & RouteParams.TestMetricId,
+		{},
+		{ name: string }
+	>;
+
+	type Delete = AuthenticatedRequest<RouteParams.TestDefinitionId & RouteParams.TestMetricId>;
 }
diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.json b/packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.json
new file mode 100644
index 0000000000..1c974205d0
--- /dev/null
+++ b/packages/cli/src/evaluation/test-runner/__tests__/mock-data/execution-data.json
@@ -0,0 +1,171 @@
+{
+	"startData": {},
+	"resultData": {
+		"runData": {
+			"When clicking ‘Test workflow’": [
+				{
+					"hints": [],
+					"startTime": 1731079118048,
+					"executionTime": 0,
+					"source": [],
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"query": "First item"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"query": "Second item"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"query": "Third item"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					}
+				}
+			],
+			"Edit Fields": [
+				{
+					"hints": [],
+					"startTime": 1731079118049,
+					"executionTime": 0,
+					"source": [
+						{
+							"previousNode": "When clicking ‘Test workflow’"
+						}
+					],
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"foo": "bar"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"foo": "bar"
+									},
+									"pairedItem": {
+										"item": 1
+									}
+								},
+								{
+									"json": {
+										"foo": "bar"
+									},
+									"pairedItem": {
+										"item": 2
+									}
+								}
+							]
+						]
+					}
+				}
+			],
+			"Code": [
+				{
+					"hints": [],
+					"startTime": 1731079118049,
+					"executionTime": 3,
+					"source": [
+						{
+							"previousNode": "Edit Fields"
+						}
+					],
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"foo": "bar",
+										"random": 0.6315509336851373
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								},
+								{
+									"json": {
+										"foo": "bar",
+										"random": 0.3336315687359024
+									},
+									"pairedItem": {
+										"item": 1
+									}
+								},
+								{
+									"json": {
+										"foo": "bar",
+										"random": 0.4241870158917733
+									},
+									"pairedItem": {
+										"item": 2
+									}
+								}
+							]
+						]
+					}
+				}
+			]
+		},
+		"pinData": {
+			"When clicking ‘Test workflow’": [
+				{
+					"json": {
+						"query": "First item"
+					},
+					"pairedItem": {
+						"item": 0
+					}
+				},
+				{
+					"json": {
+						"query": "Second item"
+					},
+					"pairedItem": {
+						"item": 0
+					}
+				},
+				{
+					"json": {
+						"query": "Third item"
+					},
+					"pairedItem": {
+						"item": 0
+					}
+				}
+			]
+		},
+		"lastNodeExecuted": "Code"
+	},
+	"executionData": {
+		"contextData": {},
+		"nodeExecutionStack": [],
+		"metadata": {},
+		"waitingExecution": {},
+		"waitingExecutionSource": {}
+	}
+}
diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.evaluation.json b/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.evaluation.json
new file mode 100644
index 0000000000..c2386f010c
--- /dev/null
+++ b/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.evaluation.json
@@ -0,0 +1,124 @@
+{
+	"name": "Evaluation Workflow",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "285ac92b-256f-4bb2-a450-6486b01593cb",
+			"name": "Execute Workflow Trigger",
+			"type": "n8n-nodes-base.executeWorkflowTrigger",
+			"typeVersion": 1,
+			"position": [520, 340]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"options": {
+						"caseSensitive": true,
+						"leftValue": "",
+						"typeValidation": "strict",
+						"version": 2
+					},
+					"conditions": [
+						{
+							"id": "9d3abc8d-3270-4bec-9a59-82622d5dbb5a",
+							"leftValue": "={{ $json.newExecution.Code[0].data.main[0].length }}",
+							"rightValue": 3,
+							"operator": {
+								"type": "number",
+								"operation": "gte"
+							}
+						},
+						{
+							"id": "894ce84b-13a4-4415-99c0-0c25182903bb",
+							"leftValue": "={{ $json.newExecution.Code[0].data.main[0][0].json.random }}",
+							"rightValue": 0.7,
+							"operator": {
+								"type": "number",
+								"operation": "lt"
+							}
+						}
+					],
+					"combinator": "and"
+				},
+				"options": {}
+			},
+			"id": "320b0355-3886-41df-b039-4666bf28e47b",
+			"name": "If",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 2.2,
+			"position": [740, 340]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "3b65d55a-158f-40c6-9853-a1c44b7ba1e5",
+							"name": "success",
+							"value": true,
+							"type": "boolean"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "0c7a1ee8-0cf0-4d7f-99a3-186bbcd8815a",
+			"name": "Success",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [980, 220]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "6cc8b402-4a30-4873-b825-963a1f1b8b82",
+							"name": "success",
+							"value": false,
+							"type": "boolean"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "50d3f84a-d99f-4e04-bdbd-3e8c2668e708",
+			"name": "Fail",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [980, 420]
+		}
+	],
+	"connections": {
+		"Execute Workflow Trigger": {
+			"main": [
+				[
+					{
+						"node": "If",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"If": {
+			"main": [
+				[
+					{
+						"node": "Success",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Fail",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.under-test.json b/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.under-test.json
new file mode 100644
index 0000000000..0204283a1b
--- /dev/null
+++ b/packages/cli/src/evaluation/test-runner/__tests__/mock-data/workflow.under-test.json
@@ -0,0 +1,78 @@
+{
+	"name": "Workflow Under Test",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-80, 0],
+			"id": "72256d90-3a67-4e29-b032-47df4e5768af",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "acfeecbe-443c-4220-b63b-d44d69216902",
+							"name": "foo",
+							"value": "bar",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [140, 0],
+			"id": "319f29bc-1dd4-4122-b223-c584752151a4",
+			"name": "Edit Fields"
+		},
+		{
+			"parameters": {
+				"jsCode": "for (const item of $input.all()) {\n  item.json.random = Math.random();\n}\n\nreturn $input.all();"
+			},
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [380, 0],
+			"id": "d2474215-63af-40a4-a51e-0ea30d762621",
+			"name": "Code"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Wait",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Wait": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts
new file mode 100644
index 0000000000..5c8f8e958b
--- /dev/null
+++ b/packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts
@@ -0,0 +1,231 @@
+import type { SelectQueryBuilder } from '@n8n/typeorm';
+import { stringify } from 'flatted';
+import { readFileSync } from 'fs';
+import { mock, mockDeep } from 'jest-mock-extended';
+import type { IRun } from 'n8n-workflow';
+import path from 'path';
+
+import type { ActiveExecutions } from '@/active-executions';
+import type { ExecutionEntity } from '@/databases/entities/execution-entity';
+import type { TestDefinition } from '@/databases/entities/test-definition.ee';
+import type { TestRun } from '@/databases/entities/test-run.ee';
+import type { User } from '@/databases/entities/user';
+import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import type { WorkflowRunner } from '@/workflow-runner';
+
+import { TestRunnerService } from '../test-runner.service.ee';
+
+const wfUnderTestJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/workflow.under-test.json'), { encoding: 'utf-8' }),
+);
+
+const wfEvaluationJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/workflow.evaluation.json'), { encoding: 'utf-8' }),
+);
+
+const executionDataJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.json'), { encoding: 'utf-8' }),
+);
+
+const executionMocks = [
+	mock<ExecutionEntity>({
+		id: 'some-execution-id',
+		workflowId: 'workflow-under-test-id',
+		status: 'success',
+		executionData: {
+			data: stringify(executionDataJson),
+		},
+	}),
+	mock<ExecutionEntity>({
+		id: 'some-execution-id-2',
+		workflowId: 'workflow-under-test-id',
+		status: 'success',
+		executionData: {
+			data: stringify(executionDataJson),
+		},
+	}),
+];
+
+function mockExecutionData() {
+	return mock<IRun>({
+		data: {
+			resultData: {
+				runData: {},
+			},
+		},
+	});
+}
+
+describe('TestRunnerService', () => {
+	const executionRepository = mock<ExecutionRepository>();
+	const workflowRepository = mock<WorkflowRepository>();
+	const workflowRunner = mock<WorkflowRunner>();
+	const activeExecutions = mock<ActiveExecutions>();
+	const testRunRepository = mock<TestRunRepository>();
+
+	beforeEach(() => {
+		const executionsQbMock = mockDeep<SelectQueryBuilder<ExecutionEntity>>({
+			fallbackMockImplementation: jest.fn().mockReturnThis(),
+		});
+
+		executionsQbMock.getMany.mockResolvedValueOnce(executionMocks);
+		executionRepository.createQueryBuilder.mockReturnValueOnce(executionsQbMock);
+		executionRepository.findOne
+			.calledWith(expect.objectContaining({ where: { id: 'some-execution-id' } }))
+			.mockResolvedValueOnce(executionMocks[0]);
+		executionRepository.findOne
+			.calledWith(expect.objectContaining({ where: { id: 'some-execution-id-2' } }))
+			.mockResolvedValueOnce(executionMocks[1]);
+
+		testRunRepository.createTestRun.mockResolvedValue(mock<TestRun>({ id: 'test-run-id' }));
+	});
+
+	afterEach(() => {
+		activeExecutions.getPostExecutePromise.mockClear();
+		workflowRunner.run.mockClear();
+		testRunRepository.createTestRun.mockClear();
+		testRunRepository.markAsRunning.mockClear();
+		testRunRepository.markAsCompleted.mockClear();
+	});
+
+	test('should create an instance of TestRunnerService', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+		);
+
+		expect(testRunnerService).toBeInstanceOf(TestRunnerService);
+	});
+
+	test('should create and run test cases from past executions', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+		);
+
+		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
+			id: 'workflow-under-test-id',
+			...wfUnderTestJson,
+		});
+
+		workflowRepository.findById.calledWith('evaluation-workflow-id').mockResolvedValueOnce({
+			id: 'evaluation-workflow-id',
+			...wfEvaluationJson,
+		});
+
+		workflowRunner.run.mockResolvedValue('test-execution-id');
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+			}),
+		);
+
+		expect(executionRepository.createQueryBuilder).toHaveBeenCalledTimes(1);
+		expect(executionRepository.findOne).toHaveBeenCalledTimes(2);
+		expect(workflowRunner.run).toHaveBeenCalledTimes(2);
+	});
+
+	test('should run both workflow under test and evaluation workflow', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+		);
+
+		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
+			id: 'workflow-under-test-id',
+			...wfUnderTestJson,
+		});
+
+		workflowRepository.findById.calledWith('evaluation-workflow-id').mockResolvedValueOnce({
+			id: 'evaluation-workflow-id',
+			...wfEvaluationJson,
+		});
+
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-2');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-3');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-4');
+
+		// Mock executions of workflow under test
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id')
+			.mockResolvedValue(mockExecutionData());
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-3')
+			.mockResolvedValue(mockExecutionData());
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-4')
+			.mockResolvedValue(mockExecutionData());
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+			}),
+		);
+
+		expect(workflowRunner.run).toHaveBeenCalledTimes(4);
+
+		// Check workflow under test was executed
+		expect(workflowRunner.run).toHaveBeenCalledWith(
+			expect.objectContaining({
+				executionMode: 'evaluation',
+				pinData: {
+					'When clicking ‘Test workflow’':
+						executionDataJson.resultData.runData['When clicking ‘Test workflow’'][0].data.main[0],
+				},
+				workflowData: expect.objectContaining({
+					id: 'workflow-under-test-id',
+				}),
+			}),
+		);
+
+		// Check evaluation workflow was executed
+		expect(workflowRunner.run).toHaveBeenCalledWith(
+			expect.objectContaining({
+				executionMode: 'evaluation',
+				executionData: expect.objectContaining({
+					executionData: expect.objectContaining({
+						nodeExecutionStack: expect.arrayContaining([
+							expect.objectContaining({ data: expect.anything() }),
+						]),
+					}),
+				}),
+				workflowData: expect.objectContaining({
+					id: 'evaluation-workflow-id',
+				}),
+			}),
+		);
+
+		// Check Test Run status was updated correctly
+		expect(testRunRepository.createTestRun).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.markAsRunning).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.markAsRunning).toHaveBeenCalledWith('test-run-id');
+		expect(testRunRepository.markAsCompleted).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.markAsCompleted).toHaveBeenCalledWith('test-run-id', {
+			success: false,
+		});
+	});
+});
diff --git a/packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts
new file mode 100644
index 0000000000..e717742b42
--- /dev/null
+++ b/packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts
@@ -0,0 +1,217 @@
+import { parse } from 'flatted';
+import type {
+	IDataObject,
+	IPinData,
+	IRun,
+	IRunData,
+	IWorkflowExecutionDataProcess,
+} from 'n8n-workflow';
+import assert from 'node:assert';
+import { Service } from 'typedi';
+
+import { ActiveExecutions } from '@/active-executions';
+import type { ExecutionEntity } from '@/databases/entities/execution-entity';
+import type { TestDefinition } from '@/databases/entities/test-definition.ee';
+import type { User } from '@/databases/entities/user';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import type { IExecutionResponse } from '@/interfaces';
+import { getRunData } from '@/workflow-execute-additional-data';
+import { WorkflowRunner } from '@/workflow-runner';
+
+/**
+ * This service orchestrates the running of test cases.
+ * It uses the test definitions to find
+ * past executions, creates pin data from them,
+ * and runs the workflow-under-test with the pin data.
+ * After the workflow-under-test finishes, it runs the evaluation workflow
+ * with the original and new run data.
+ * TODO: Node pinning
+ * TODO: Collect metrics
+ */
+@Service()
+export class TestRunnerService {
+	constructor(
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowRunner: WorkflowRunner,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly activeExecutions: ActiveExecutions,
+		private readonly testRunRepository: TestRunRepository,
+	) {}
+
+	/**
+	 * Extracts the execution data from the past execution.
+	 * Creates a pin data object from the past execution data
+	 * for the given workflow.
+	 * For now, it only pins trigger nodes.
+	 */
+	private createTestDataFromExecution(workflow: WorkflowEntity, execution: ExecutionEntity) {
+		const executionData = parse(execution.executionData.data) as IExecutionResponse['data'];
+
+		const triggerNodes = workflow.nodes.filter((node) => /trigger$/i.test(node.type));
+
+		const pinData = {} as IPinData;
+
+		for (const triggerNode of triggerNodes) {
+			const triggerData = executionData.resultData.runData[triggerNode.name];
+			if (triggerData?.[0]?.data?.main?.[0]) {
+				pinData[triggerNode.name] = triggerData[0]?.data?.main?.[0];
+			}
+		}
+
+		return { pinData, executionData };
+	}
+
+	/**
+	 * Runs a test case with the given pin data.
+	 * Waits for the workflow under test to finish execution.
+	 */
+	private async runTestCase(
+		workflow: WorkflowEntity,
+		testCasePinData: IPinData,
+		userId: string,
+	): Promise<IRun | undefined> {
+		// Prepare the data to run the workflow
+		const data: IWorkflowExecutionDataProcess = {
+			executionMode: 'evaluation',
+			runData: {},
+			pinData: testCasePinData,
+			workflowData: workflow,
+			partialExecutionVersion: '-1',
+			userId,
+		};
+
+		// Trigger the workflow under test with mocked data
+		const executionId = await this.workflowRunner.run(data);
+		assert(executionId);
+
+		// Wait for the execution to finish
+		const executePromise = this.activeExecutions.getPostExecutePromise(executionId);
+
+		return await executePromise;
+	}
+
+	/**
+	 * Run the evaluation workflow with the expected and actual run data.
+	 */
+	private async runTestCaseEvaluation(
+		evaluationWorkflow: WorkflowEntity,
+		expectedData: IRunData,
+		actualData: IRunData,
+	) {
+		// Prepare the evaluation wf input data.
+		// Provide both the expected data and the actual data
+		const evaluationInputData = {
+			json: {
+				originalExecution: expectedData,
+				newExecution: actualData,
+			},
+		};
+
+		// Prepare the data to run the evaluation workflow
+		const data = await getRunData(evaluationWorkflow, [evaluationInputData]);
+
+		data.executionMode = 'evaluation';
+
+		// Trigger the evaluation workflow
+		const executionId = await this.workflowRunner.run(data);
+		assert(executionId);
+
+		// Wait for the execution to finish
+		const executePromise = this.activeExecutions.getPostExecutePromise(executionId);
+
+		return await executePromise;
+	}
+
+	private extractEvaluationResult(execution: IRun): IDataObject {
+		const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
+		assert(lastNodeExecuted, 'Could not find the last node executed in evaluation workflow');
+
+		// Extract the output of the last node executed in the evaluation workflow
+		// We use only the first item of a first main output
+		const lastNodeTaskData = execution.data.resultData.runData[lastNodeExecuted]?.[0];
+		const mainConnectionData = lastNodeTaskData?.data?.main?.[0];
+		return mainConnectionData?.[0]?.json ?? {};
+	}
+
+	/**
+	 * Creates a new test run for the given test definition.
+	 */
+	public async runTest(user: User, test: TestDefinition): Promise<void> {
+		const workflow = await this.workflowRepository.findById(test.workflowId);
+		assert(workflow, 'Workflow not found');
+
+		const evaluationWorkflow = await this.workflowRepository.findById(test.evaluationWorkflowId);
+		assert(evaluationWorkflow, 'Evaluation workflow not found');
+
+		// 0. Create new Test Run
+		const testRun = await this.testRunRepository.createTestRun(test.id);
+		assert(testRun, 'Unable to create a test run');
+
+		// 1. Make test cases from previous executions
+
+		// Select executions with the annotation tag and workflow ID of the test.
+		// Fetch only ids to reduce the data transfer.
+		const pastExecutions: ReadonlyArray<Pick<ExecutionEntity, 'id'>> =
+			await this.executionRepository
+				.createQueryBuilder('execution')
+				.select('execution.id')
+				.leftJoin('execution.annotation', 'annotation')
+				.leftJoin('annotation.tags', 'annotationTag')
+				.where('annotationTag.id = :tagId', { tagId: test.annotationTagId })
+				.andWhere('execution.workflowId = :workflowId', { workflowId: test.workflowId })
+				.getMany();
+
+		// 2. Run over all the test cases
+
+		await this.testRunRepository.markAsRunning(testRun.id);
+
+		const metrics = [];
+
+		for (const { id: pastExecutionId } of pastExecutions) {
+			// Fetch past execution with data
+			const pastExecution = await this.executionRepository.findOne({
+				where: { id: pastExecutionId },
+				relations: ['executionData', 'metadata'],
+			});
+			assert(pastExecution, 'Execution not found');
+
+			const testData = this.createTestDataFromExecution(workflow, pastExecution);
+			const { pinData, executionData } = testData;
+
+			// Run the test case and wait for it to finish
+			const testCaseExecution = await this.runTestCase(workflow, pinData, user.id);
+
+			// In case of a permission check issue, the test case execution will be undefined.
+			// Skip them and continue with the next test case
+			if (!testCaseExecution) {
+				continue;
+			}
+
+			// Collect the results of the test case execution
+			const testCaseRunData = testCaseExecution.data.resultData.runData;
+
+			// Get the original runData from the test case execution data
+			const originalRunData = executionData.resultData.runData;
+
+			// Run the evaluation workflow with the original and new run data
+			const evalExecution = await this.runTestCaseEvaluation(
+				evaluationWorkflow,
+				originalRunData,
+				testCaseRunData,
+			);
+			assert(evalExecution);
+
+			// Extract the output of the last node executed in the evaluation workflow
+			metrics.push(this.extractEvaluationResult(evalExecution));
+		}
+
+		// TODO: 3. Aggregate the results
+		// Now we just set success to true if all the test cases passed
+		const aggregatedMetrics = { success: metrics.every((metric) => metric.success) };
+
+		await this.testRunRepository.markAsCompleted(testRun.id, aggregatedMetrics);
+	}
+}
diff --git a/packages/cli/src/execution-lifecycle-hooks/shared/__tests__/shared-hook-functions.test.ts b/packages/cli/src/execution-lifecycle-hooks/shared/__tests__/shared-hook-functions.test.ts
new file mode 100644
index 0000000000..97dfa4c255
--- /dev/null
+++ b/packages/cli/src/execution-lifecycle-hooks/shared/__tests__/shared-hook-functions.test.ts
@@ -0,0 +1,37 @@
+import { mock } from 'jest-mock-extended';
+import type { IRun } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { determineFinalExecutionStatus } from '../shared-hook-functions';
+
+describe('determineFinalExecutionStatus', () => {
+	describe('When waitTill is not set', () => {
+		test.each(['canceled', 'crashed', 'error', 'success'])('should return "%s"', (status) => {
+			const runData = { status, data: {} } as IRun;
+			expect(determineFinalExecutionStatus(runData)).toBe(status);
+		});
+	});
+
+	it('should return "error" when resultData.error exists', () => {
+		const runData = {
+			status: 'running',
+			data: {
+				resultData: {
+					error: new NodeOperationError(mock(), 'An error occurred'),
+				},
+			},
+		} as IRun;
+
+		expect(determineFinalExecutionStatus(runData)).toBe('error');
+	});
+
+	it('should return "waiting" when waitTill is defined', () => {
+		const runData = {
+			status: 'running',
+			data: {},
+			waitTill: new Date('2022-01-01T00:00:00'),
+		} as IRun;
+
+		expect(determineFinalExecutionStatus(runData)).toBe('waiting');
+	});
+});
diff --git a/packages/cli/src/middlewares/list-query/dtos/test-definitions.filter.dto.ts b/packages/cli/src/middlewares/list-query/dtos/test-definitions.filter.dto.ts
new file mode 100644
index 0000000000..c8d962f63d
--- /dev/null
+++ b/packages/cli/src/middlewares/list-query/dtos/test-definitions.filter.dto.ts
@@ -0,0 +1,15 @@
+import { Expose } from 'class-transformer';
+import { IsOptional, IsString } from 'class-validator';
+
+import { BaseFilter } from './base.filter.dto';
+
+export class TestDefinitionsFilter extends BaseFilter {
+	@IsString()
+	@IsOptional()
+	@Expose()
+	workflowId?: string;
+
+	static async fromString(rawFilter: string) {
+		return await this.toFilter(rawFilter, TestDefinitionsFilter);
+	}
+}
diff --git a/packages/cli/src/middlewares/list-query/filter.ts b/packages/cli/src/middlewares/list-query/filter.ts
index 9522238b2e..8443d01747 100644
--- a/packages/cli/src/middlewares/list-query/filter.ts
+++ b/packages/cli/src/middlewares/list-query/filter.ts
@@ -5,6 +5,7 @@ import * as ResponseHelper from '@/response-helper';
 import { toError } from '@/utils';
 
 import { CredentialsFilter } from './dtos/credentials.filter.dto';
+import { TestDefinitionsFilter } from './dtos/test-definitions.filter.dto';
 import { UserFilter } from './dtos/user.filter.dto';
 import { WorkflowFilter } from './dtos/workflow.filter.dto';
 
@@ -25,6 +26,8 @@ export const filterListQueryMiddleware = async (
 		Filter = CredentialsFilter;
 	} else if (req.baseUrl.endsWith('users')) {
 		Filter = UserFilter;
+	} else if (req.baseUrl.endsWith('test-definitions')) {
+		Filter = TestDefinitionsFilter;
 	} else {
 		return next();
 	}
diff --git a/packages/cli/src/runners/__tests__/task-broker.test.ts b/packages/cli/src/runners/__tests__/task-broker.test.ts
index 2f9a6a26e7..8e86f189e8 100644
--- a/packages/cli/src/runners/__tests__/task-broker.test.ts
+++ b/packages/cli/src/runners/__tests__/task-broker.test.ts
@@ -524,7 +524,9 @@ describe('TaskBroker', () => {
 			const requestParams: RunnerMessage.ToBroker.TaskDataRequest['requestParams'] = {
 				dataOfNodes: 'all',
 				env: true,
-				input: true,
+				input: {
+					include: true,
+				},
 				prevNode: true,
 			};
 
diff --git a/packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts b/packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts
index 003e2c5f4e..b092e08fed 100644
--- a/packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts
+++ b/packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts
@@ -1,10 +1,23 @@
 import type { TaskRunnersConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
+import type WebSocket from 'ws';
 
-import { Time } from '@/constants';
+import { Time, WsStatusCodes } from '@/constants';
 import { TaskRunnerWsServer } from '@/runners/runner-ws-server';
 
 describe('TaskRunnerWsServer', () => {
+	describe('removeConnection', () => {
+		it('should close with 1000 status code by default', async () => {
+			const server = new TaskRunnerWsServer(mock(), mock(), mock(), mock(), mock());
+			const ws = mock<WebSocket>();
+			server.runnerConnections.set('test-runner', ws);
+
+			await server.removeConnection('test-runner');
+
+			expect(ws.close).toHaveBeenCalledWith(WsStatusCodes.CloseNormal);
+		});
+	});
+
 	describe('heartbeat timer', () => {
 		it('should set up heartbeat timer on server start', async () => {
 			const setIntervalSpy = jest.spyOn(global, 'setInterval');
diff --git a/packages/cli/src/runners/default-task-runner-disconnect-analyzer.ts b/packages/cli/src/runners/default-task-runner-disconnect-analyzer.ts
index d61179372b..9db537ee95 100644
--- a/packages/cli/src/runners/default-task-runner-disconnect-analyzer.ts
+++ b/packages/cli/src/runners/default-task-runner-disconnect-analyzer.ts
@@ -12,6 +12,10 @@ import type { DisconnectAnalyzer, DisconnectErrorOptions } from './runner-types'
  */
 @Service()
 export class DefaultTaskRunnerDisconnectAnalyzer implements DisconnectAnalyzer {
+	get isCloudDeployment() {
+		return config.get('deployment.type') === 'cloud';
+	}
+
 	async toDisconnectError(opts: DisconnectErrorOptions): Promise<Error> {
 		const { reason, heartbeatInterval } = opts;
 
@@ -22,6 +26,9 @@ export class DefaultTaskRunnerDisconnectAnalyzer implements DisconnectAnalyzer {
 			);
 		}
 
-		return new TaskRunnerDisconnectedError(opts.runnerId ?? 'Unknown runner ID');
+		return new TaskRunnerDisconnectedError(
+			opts.runnerId ?? 'Unknown runner ID',
+			this.isCloudDeployment,
+		);
 	}
 }
diff --git a/packages/cli/src/runners/errors/__tests__/task-runner-disconnected-error.test.ts b/packages/cli/src/runners/errors/__tests__/task-runner-disconnected-error.test.ts
new file mode 100644
index 0000000000..a6b88462e3
--- /dev/null
+++ b/packages/cli/src/runners/errors/__tests__/task-runner-disconnected-error.test.ts
@@ -0,0 +1,49 @@
+import { TaskRunnerDisconnectedError } from '../task-runner-disconnected-error';
+
+describe('TaskRunnerDisconnectedError', () => {
+	it('should have the correct default error message', () => {
+		const error = new TaskRunnerDisconnectedError('test-runner-id', false);
+
+		expect(error.message).toBe('Node execution failed');
+	});
+
+	it('should have the error level set to "error"', () => {
+		const error = new TaskRunnerDisconnectedError('test-runner-id', false);
+
+		expect(error.level).toBe('error');
+	});
+
+	it('should set the correct description for non-cloud deployments', () => {
+		const error = new TaskRunnerDisconnectedError('test-runner-id', false);
+
+		expect(error.description).toContain(
+			'This can happen for various reasons. Please try executing the node again.',
+		);
+		expect(error.description).toContain(
+			'1. Reduce the number of items processed at a time, by batching them using a loop node',
+		);
+		expect(error.description).toContain(
+			"2. Increase the memory available to the task runner with 'N8N_RUNNERS_MAX_OLD_SPACE_SIZE' environment variable",
+		);
+		expect(error.description).not.toContain(
+			'Upgrade your cloud plan to increase the available memory',
+		);
+	});
+
+	it('should set the correct description for cloud deployments', () => {
+		const error = new TaskRunnerDisconnectedError('test-runner-id', true);
+
+		expect(error.description).toContain(
+			'This can happen for various reasons. Please try executing the node again.',
+		);
+		expect(error.description).toContain(
+			'1. Reduce the number of items processed at a time, by batching them using a loop node',
+		);
+		expect(error.description).toContain(
+			'2. Upgrade your cloud plan to increase the available memory',
+		);
+		expect(error.description).not.toContain(
+			"Increase the memory available to the task runner with 'N8N_RUNNERS_MAX_OLD_SPACE_SIZE' environment variable",
+		);
+	});
+});
diff --git a/packages/cli/src/runners/errors/task-runner-disconnected-error.ts b/packages/cli/src/runners/errors/task-runner-disconnected-error.ts
index 6c7c49450a..3f4f468b1a 100644
--- a/packages/cli/src/runners/errors/task-runner-disconnected-error.ts
+++ b/packages/cli/src/runners/errors/task-runner-disconnected-error.ts
@@ -1,7 +1,34 @@
+import type { TaskRunner } from '@n8n/task-runner';
 import { ApplicationError } from 'n8n-workflow';
 
 export class TaskRunnerDisconnectedError extends ApplicationError {
-	constructor(runnerId: string) {
-		super(`Task runner (${runnerId}) disconnected`);
+	public description: string;
+
+	constructor(
+		public readonly runnerId: TaskRunner['id'],
+		isCloudDeployment: boolean,
+	) {
+		super('Node execution failed');
+
+		const fixSuggestions = {
+			reduceItems:
+				'Reduce the number of items processed at a time, by batching them using a loop node',
+			increaseMemory:
+				"Increase the memory available to the task runner with 'N8N_RUNNERS_MAX_OLD_SPACE_SIZE' environment variable",
+			upgradePlan: 'Upgrade your cloud plan to increase the available memory',
+		};
+
+		const subtitle =
+			'This can happen for various reasons. Please try executing the node again. If the problem persists, you can try the following:';
+		const suggestions = isCloudDeployment
+			? [fixSuggestions.reduceItems, fixSuggestions.upgradePlan]
+			: [fixSuggestions.reduceItems, fixSuggestions.increaseMemory];
+		const suggestionsText = suggestions
+			.map((suggestion, index) => `${index + 1}. ${suggestion}`)
+			.join('<br/>');
+
+		const description = `${subtitle}<br/><br/>${suggestionsText}`;
+
+		this.description = description;
 	}
 }
diff --git a/packages/cli/src/runners/internal-task-runner-disconnect-analyzer.ts b/packages/cli/src/runners/internal-task-runner-disconnect-analyzer.ts
index e27f76b628..26d8de5683 100644
--- a/packages/cli/src/runners/internal-task-runner-disconnect-analyzer.ts
+++ b/packages/cli/src/runners/internal-task-runner-disconnect-analyzer.ts
@@ -1,8 +1,6 @@
 import { TaskRunnersConfig } from '@n8n/config';
 import { Service } from 'typedi';
 
-import config from '@/config';
-
 import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
 import { TaskRunnerOomError } from './errors/task-runner-oom-error';
 import type { DisconnectErrorOptions } from './runner-types';
@@ -16,10 +14,6 @@ import { TaskRunnerProcess } from './task-runner-process';
  */
 @Service()
 export class InternalTaskRunnerDisconnectAnalyzer extends DefaultTaskRunnerDisconnectAnalyzer {
-	private get isCloudDeployment() {
-		return config.get('deployment.type') === 'cloud';
-	}
-
 	private readonly exitReasonSignal: SlidingWindowSignal<TaskRunnerProcessEventMap, 'exit'>;
 
 	constructor(
diff --git a/packages/cli/src/runners/runner-types.ts b/packages/cli/src/runners/runner-types.ts
index 132d688e98..ca26ed41b8 100644
--- a/packages/cli/src/runners/runner-types.ts
+++ b/packages/cli/src/runners/runner-types.ts
@@ -6,6 +6,8 @@ import type { TaskRunner } from './task-broker.service';
 import type { AuthlessRequest } from '../requests';
 
 export interface DisconnectAnalyzer {
+	isCloudDeployment: boolean;
+
 	toDisconnectError(opts: DisconnectErrorOptions): Promise<Error>;
 }
 
diff --git a/packages/cli/src/runners/runner-ws-server.ts b/packages/cli/src/runners/runner-ws-server.ts
index 195490589d..3a5fa53029 100644
--- a/packages/cli/src/runners/runner-ws-server.ts
+++ b/packages/cli/src/runners/runner-ws-server.ts
@@ -4,7 +4,7 @@ import { ApplicationError } from 'n8n-workflow';
 import { Service } from 'typedi';
 import type WebSocket from 'ws';
 
-import { Time } from '@/constants';
+import { Time, WsStatusCodes } from '@/constants';
 import { Logger } from '@/logging/logger.service';
 
 import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
@@ -21,15 +21,7 @@ function heartbeat(this: WebSocket) {
 	this.isAlive = true;
 }
 
-const enum WsStatusCode {
-	CloseNormal = 1000,
-	CloseGoingAway = 1001,
-	CloseProtocolError = 1002,
-	CloseUnsupportedData = 1003,
-	CloseNoStatus = 1005,
-	CloseAbnormal = 1006,
-	CloseInvalidData = 1007,
-}
+type WsStatusCode = (typeof WsStatusCodes)[keyof typeof WsStatusCodes];
 
 @Service()
 export class TaskRunnerWsServer {
@@ -62,7 +54,7 @@ export class TaskRunnerWsServer {
 					void this.removeConnection(
 						runnerId,
 						'failed-heartbeat-check',
-						WsStatusCode.CloseNoStatus,
+						WsStatusCodes.CloseNoStatus,
 					);
 					this.runnerLifecycleEvents.emit('runner:failed-heartbeat-check');
 					return;
@@ -126,7 +118,7 @@ export class TaskRunnerWsServer {
 						this.sendMessage.bind(this, id) as MessageCallback,
 					);
 
-					this.logger.info(`Runner "${message.name}" (${id}) has been registered`);
+					this.logger.info(`Registered runner "${message.name}" (${id}) `);
 					return;
 				}
 
@@ -156,7 +148,7 @@ export class TaskRunnerWsServer {
 	async removeConnection(
 		id: TaskRunner['id'],
 		reason: DisconnectReason = 'unknown',
-		code?: WsStatusCode,
+		code: WsStatusCode = WsStatusCodes.CloseNormal,
 	) {
 		const connection = this.runnerConnections.get(id);
 		if (connection) {
@@ -166,6 +158,7 @@ export class TaskRunnerWsServer {
 				heartbeatInterval: this.taskTunnersConfig.heartbeatInterval,
 			});
 			this.taskBroker.deregisterRunner(id, disconnectError);
+			this.logger.debug(`Deregistered runner "${id}"`);
 			connection.close(code);
 			this.runnerConnections.delete(id);
 		}
@@ -180,7 +173,8 @@ export class TaskRunnerWsServer {
 		// shutting them down
 		await Promise.all(
 			Array.from(this.runnerConnections.keys()).map(
-				async (id) => await this.removeConnection(id, 'shutting-down', WsStatusCode.CloseGoingAway),
+				async (id) =>
+					await this.removeConnection(id, 'shutting-down', WsStatusCodes.CloseGoingAway),
 			),
 		);
 	}
diff --git a/packages/cli/src/runners/task-broker.service.ts b/packages/cli/src/runners/task-broker.service.ts
index af76fb6cac..80e918b47a 100644
--- a/packages/cli/src/runners/task-broker.service.ts
+++ b/packages/cli/src/runners/task-broker.service.ts
@@ -525,7 +525,7 @@ export class TaskBroker {
 				return;
 			}
 			if (e instanceof TaskDeferredError) {
-				this.logger.info(`Task (${taskId}) deferred until runner is ready`);
+				this.logger.debug(`Task (${taskId}) deferred until runner is ready`);
 				this.pendingTaskRequests.push(request); // will settle on receiving task offer from runner
 				return;
 			}
diff --git a/packages/cli/src/runners/task-managers/__tests__/data-request-response-stripper.test.ts b/packages/cli/src/runners/task-managers/__tests__/data-request-response-stripper.test.ts
index d100fc1430..4b27542c4d 100644
--- a/packages/cli/src/runners/task-managers/__tests__/data-request-response-stripper.test.ts
+++ b/packages/cli/src/runners/task-managers/__tests__/data-request-response-stripper.test.ts
@@ -18,6 +18,7 @@ const workflow: DataRequestResponse['workflow'] = mock<DataRequestResponse['work
 const debugHelperNodeOutItems: INodeExecutionData[] = [
 	{
 		json: {
+			idx: 0,
 			uid: 'abb74fd4-bef2-4fae-9d53-ea24e9eb3032',
 			email: 'Dan.Schmidt31@yahoo.com',
 			firstname: 'Toni',
@@ -28,6 +29,31 @@ const debugHelperNodeOutItems: INodeExecutionData[] = [
 			item: 0,
 		},
 	},
+	{
+		json: {
+			idx: 1,
+			uid: '4620e4-c1b4-dd8b-9a45-d0f9a29a3b7f',
+			email: 'bob.johnson@domain.com',
+			firstName: 'Bob',
+			lastName: 'Johnson',
+			password: '6e41b5ecf',
+		},
+		pairedItem: {
+			item: 1,
+		},
+	},
+	{
+		json: {
+			idx: 2,
+			email: '4358d3-418b-a8b3-49cb-076b1180f402',
+			firstName: 'Eve',
+			lastName: 'Johnson',
+			password: 'e2414620e',
+		},
+		pairedItem: {
+			item: 2,
+		},
+	},
 ];
 const codeNodeInputItems: INodeExecutionData[] = debugHelperNodeOutItems;
 const envProviderState: DataRequestResponse['envProviderState'] = mock<
@@ -137,7 +163,9 @@ describe('DataRequestResponseStripper', () => {
 	const allDataParam: TaskDataRequestParams = {
 		dataOfNodes: 'all',
 		env: true,
-		input: true,
+		input: {
+			include: true,
+		},
 		prevNode: true,
 	};
 
@@ -177,7 +205,9 @@ describe('DataRequestResponseStripper', () => {
 
 	describe('input data', () => {
 		const allExceptInputParam = newRequestParam({
-			input: false,
+			input: {
+				include: false,
+			},
 		});
 
 		it('drops input data from result', () => {
@@ -186,10 +216,23 @@ describe('DataRequestResponseStripper', () => {
 			expect(result.inputData).toStrictEqual({});
 		});
 
-		it('drops input data from result', () => {
-			const result = new DataRequestResponseStripper(taskData, allExceptInputParam).strip();
+		it('returns only chunked data', () => {
+			const result = new DataRequestResponseStripper(
+				taskData,
+				newRequestParam({
+					input: {
+						include: true,
+						chunk: {
+							startIndex: 1,
+							count: 1,
+						},
+					},
+				}),
+			).strip();
 
-			expect(result.inputData).toStrictEqual({});
+			expect(result.inputData).toStrictEqual({
+				main: [debugHelperNodeOutItems.slice(1, 2)],
+			});
 		});
 	});
 
diff --git a/packages/cli/src/runners/task-managers/data-request-response-stripper.ts b/packages/cli/src/runners/task-managers/data-request-response-stripper.ts
index 721f51d3c1..8acfd26c7b 100644
--- a/packages/cli/src/runners/task-managers/data-request-response-stripper.ts
+++ b/packages/cli/src/runners/task-managers/data-request-response-stripper.ts
@@ -6,6 +6,7 @@ import type {
 	IRunExecutionData,
 	ITaskDataConnections,
 } from 'n8n-workflow';
+import * as a from 'node:assert/strict';
 
 /**
  * Strips data from data request response based on the specified parameters
@@ -81,11 +82,31 @@ export class DataRequestResponseStripper {
 	}
 
 	private stripInputData(inputData: ITaskDataConnections): ITaskDataConnections {
-		if (this.stripParams.input) {
+		if (!this.stripParams.input.include) {
+			return {};
+		}
+
+		return this.stripParams.input.chunk ? this.stripChunkedInputData(inputData) : inputData;
+	}
+
+	private stripChunkedInputData(inputData: ITaskDataConnections): ITaskDataConnections {
+		const { chunk } = this.stripParams.input;
+		a.ok(chunk);
+
+		const inputItems = inputData.main?.[0];
+		if (!inputItems) {
 			return inputData;
 		}
 
-		return {};
+		// If a chunk of the input data is requested, we only return that chunk
+		// It is the responsibility of the requester to rebuild the input data
+		const chunkInputItems = inputItems.slice(chunk.startIndex, chunk.startIndex + chunk.count);
+		const chunkedInputData: ITaskDataConnections = {
+			...inputData,
+			main: [chunkInputItems],
+		};
+
+		return chunkedInputData;
 	}
 
 	/**
diff --git a/packages/cli/src/runners/task-managers/task-manager.ts b/packages/cli/src/runners/task-managers/task-manager.ts
index ffc86cdf62..66f07f7b0a 100644
--- a/packages/cli/src/runners/task-managers/task-manager.ts
+++ b/packages/cli/src/runners/task-managers/task-manager.ts
@@ -1,6 +1,5 @@
-import { TaskRunnersConfig } from '@n8n/config';
 import type { TaskResultData, RequesterMessage, BrokerMessage, TaskData } from '@n8n/task-runner';
-import { DataRequestResponseReconstruct, RPC_ALLOW_LIST } from '@n8n/task-runner';
+import { RPC_ALLOW_LIST } from '@n8n/task-runner';
 import type {
 	EnvProviderState,
 	IExecuteFunctions,
@@ -18,8 +17,7 @@ import type {
 } from 'n8n-workflow';
 import { createResultOk, createResultError } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
-import * as a from 'node:assert/strict';
-import Container, { Service } from 'typedi';
+import { Service } from 'typedi';
 
 import { NodeTypes } from '@/node-types';
 
@@ -59,8 +57,6 @@ export abstract class TaskManager {
 
 	tasks: Map<string, Task> = new Map();
 
-	private readonly runnerConfig = Container.get(TaskRunnersConfig);
-
 	private readonly dataResponseBuilder = new DataRequestResponseBuilder();
 
 	constructor(private readonly nodeTypes: NodeTypes) {}
@@ -246,18 +242,6 @@ export abstract class TaskManager {
 
 		const dataRequestResponse = this.dataResponseBuilder.buildFromTaskData(job.data);
 
-		if (this.runnerConfig.assertDeduplicationOutput) {
-			const reconstruct = new DataRequestResponseReconstruct();
-			a.deepStrictEqual(
-				reconstruct.reconstructConnectionInputData(dataRequestResponse.inputData),
-				job.data.connectionInputData,
-			);
-			a.deepStrictEqual(
-				reconstruct.reconstructExecuteData(dataRequestResponse),
-				job.data.executeData,
-			);
-		}
-
 		const strippedData = new DataRequestResponseStripper(
 			dataRequestResponse,
 			requestParams,
diff --git a/packages/cli/src/runners/task-runner-server.ts b/packages/cli/src/runners/task-runner-server.ts
index a3b13fb8c4..18a48cf39d 100644
--- a/packages/cli/src/runners/task-runner-server.ts
+++ b/packages/cli/src/runners/task-runner-server.ts
@@ -163,6 +163,8 @@ export class TaskRunnerServer {
 			authEndpoint,
 			send(async (req) => await this.taskRunnerAuthController.createGrantToken(req)),
 		);
+
+		this.app.get('/healthz', (_, res) => res.send({ status: 'ok' }));
 	}
 
 	private handleUpgradeRequest = (
diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
index e0572ab215..a21ad98ac2 100644
--- a/packages/cli/src/server.ts
+++ b/packages/cli/src/server.ts
@@ -64,6 +64,7 @@ import '@/executions/executions.controller';
 import '@/external-secrets/external-secrets.controller.ee';
 import '@/license/license.controller';
 import '@/evaluation/test-definitions.controller.ee';
+import '@/evaluation/metrics.controller';
 import '@/workflows/workflow-history/workflow-history.controller.ee';
 import '@/workflows/workflows.controller';
 
diff --git a/packages/cli/src/services/dynamic-node-parameters.service.ts b/packages/cli/src/services/dynamic-node-parameters.service.ts
index dd60c85444..eb6ecc5f67 100644
--- a/packages/cli/src/services/dynamic-node-parameters.service.ts
+++ b/packages/cli/src/services/dynamic-node-parameters.service.ts
@@ -54,7 +54,7 @@ export class DynamicNodeParametersService {
 	): Promise<INodePropertyOptions[]> {
 		const nodeType = this.getNodeType(nodeTypeAndVersion);
 		if (!nodeType.description.requestDefaults?.baseURL) {
-			// This in in here for now for security reasons.
+			// This is in here for now for security reasons.
 			// Background: As the full data for the request to make does get send, and the auth data
 			// will then be applied, would it be possible to retrieve that data like that. By at least
 			// requiring a baseURL to be defined can at least not a random server be called.
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 5fad80d83c..79d04b2263 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -231,6 +231,7 @@ export class FrontendService {
 				blockFileAccessToN8nFiles: this.securityConfig.blockFileAccessToN8nFiles,
 			},
 			betaFeatures: this.frontendConfig.betaFeatures,
+			virtualSchemaView: config.getEnv('virtualSchemaView'),
 		};
 	}
 
diff --git a/packages/cli/src/wait-tracker.ts b/packages/cli/src/wait-tracker.ts
index 868fafa526..7035db3cbe 100644
--- a/packages/cli/src/wait-tracker.ts
+++ b/packages/cli/src/wait-tracker.ts
@@ -1,9 +1,5 @@
 import { InstanceSettings } from 'n8n-core';
-import {
-	ApplicationError,
-	ErrorReporterProxy as ErrorReporter,
-	type IWorkflowExecutionDataProcess,
-} from 'n8n-workflow';
+import { ApplicationError, type IWorkflowExecutionDataProcess } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -88,7 +84,7 @@ export class WaitTracker {
 				this.waitingExecutions[executionId] = {
 					executionId,
 					timer: setTimeout(() => {
-						this.startExecution(executionId);
+						void this.startExecution(executionId);
 					}, triggerTime),
 				};
 			}
@@ -103,46 +99,40 @@ export class WaitTracker {
 		delete this.waitingExecutions[executionId];
 	}
 
-	startExecution(executionId: string) {
+	async startExecution(executionId: string) {
 		this.logger.debug(`Resuming execution ${executionId}`, { executionId });
 		delete this.waitingExecutions[executionId];
 
-		(async () => {
-			// Get the data to execute
-			const fullExecutionData = await this.executionRepository.findSingleExecution(executionId, {
-				includeData: true,
-				unflattenData: true,
-			});
-
-			if (!fullExecutionData) {
-				throw new ApplicationError('Execution does not exist.', { extra: { executionId } });
-			}
-			if (fullExecutionData.finished) {
-				throw new ApplicationError('The execution did succeed and can so not be started again.');
-			}
-
-			if (!fullExecutionData.workflowData.id) {
-				throw new ApplicationError('Only saved workflows can be resumed.');
-			}
-			const workflowId = fullExecutionData.workflowData.id;
-			const project = await this.ownershipService.getWorkflowProjectCached(workflowId);
-
-			const data: IWorkflowExecutionDataProcess = {
-				executionMode: fullExecutionData.mode,
-				executionData: fullExecutionData.data,
-				workflowData: fullExecutionData.workflowData,
-				projectId: project.id,
-			};
-
-			// Start the execution again
-			await this.workflowRunner.run(data, false, false, executionId);
-		})().catch((error: Error) => {
-			ErrorReporter.error(error);
-			this.logger.error(
-				`There was a problem starting the waiting execution with id "${executionId}": "${error.message}"`,
-				{ executionId },
-			);
+		// Get the data to execute
+		const fullExecutionData = await this.executionRepository.findSingleExecution(executionId, {
+			includeData: true,
+			unflattenData: true,
 		});
+
+		if (!fullExecutionData) {
+			throw new ApplicationError('Execution does not exist.', { extra: { executionId } });
+		}
+		if (fullExecutionData.finished) {
+			throw new ApplicationError('The execution did succeed and can so not be started again.');
+		}
+
+		if (!fullExecutionData.workflowData.id) {
+			throw new ApplicationError('Only saved workflows can be resumed.');
+		}
+
+		const workflowId = fullExecutionData.workflowData.id;
+		const project = await this.ownershipService.getWorkflowProjectCached(workflowId);
+
+		const data: IWorkflowExecutionDataProcess = {
+			executionMode: fullExecutionData.mode,
+			executionData: fullExecutionData.data,
+			workflowData: fullExecutionData.workflowData,
+			projectId: project.id,
+			pushRef: fullExecutionData.data.pushRef,
+		};
+
+		// Start the execution again
+		await this.workflowRunner.run(data, false, false, executionId);
 	}
 
 	stopTracking() {
diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts
index 97322f4fe0..b7d966afa5 100644
--- a/packages/cli/src/workflow-execute-additional-data.ts
+++ b/packages/cli/src/workflow-execute-additional-data.ts
@@ -5,6 +5,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import type { PushType } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
+import { stringify } from 'flatted';
 import { WorkflowExecute } from 'n8n-core';
 import {
 	ApplicationError,
@@ -280,7 +281,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 			},
 		],
 		workflowExecuteBefore: [
-			async function (this: WorkflowHooks): Promise<void> {
+			async function (this: WorkflowHooks, _workflow, data): Promise<void> {
 				const { pushRef, executionId } = this;
 				const { id: workflowId, name: workflowName } = this.workflowData;
 				logger.debug('Executing hook (hookFunctionsPush)', {
@@ -301,6 +302,9 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 						retryOf: this.retryOf,
 						workflowId,
 						workflowName,
+						flattedRunData: data?.resultData.runData
+							? stringify(data.resultData.runData)
+							: stringify({}),
 					},
 					pushRef,
 				);
@@ -318,9 +322,17 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId,
 				});
 
-				const pushType =
-					fullRunData.status === 'waiting' ? 'executionWaiting' : 'executionFinished';
-				pushInstance.send(pushType, { executionId }, pushRef);
+				const { status } = fullRunData;
+				if (status === 'waiting') {
+					pushInstance.send('executionWaiting', { executionId }, pushRef);
+				} else {
+					const rawData = stringify(fullRunData.data);
+					pushInstance.send(
+						'executionFinished',
+						{ executionId, workflowId, status, rawData },
+						pushRef,
+					);
+				}
 			},
 		],
 	};
@@ -410,6 +422,9 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						}
 					}
 
+					const executionStatus = determineFinalExecutionStatus(fullRunData);
+					fullRunData.status = executionStatus;
+
 					const saveSettings = toSaveSettings(this.workflowData.settings);
 
 					if (isManualMode && !saveSettings.manual && !fullRunData.waitTill) {
@@ -427,7 +442,6 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						return;
 					}
 
-					const executionStatus = determineFinalExecutionStatus(fullRunData);
 					const shouldNotSave =
 						(executionStatus === 'success' && !saveSettings.success) ||
 						(executionStatus !== 'success' && !saveSettings.error);
@@ -570,6 +584,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 					}
 
 					const workflowStatusFinal = determineFinalExecutionStatus(fullRunData);
+					fullRunData.status = workflowStatusFinal;
 
 					if (workflowStatusFinal !== 'success' && workflowStatusFinal !== 'waiting') {
 						executeErrorWorkflow(
@@ -1115,6 +1130,8 @@ export function getWorkflowHooksWorkerMain(
 			if (!fullRunData.finished) return;
 
 			const executionStatus = determineFinalExecutionStatus(fullRunData);
+			fullRunData.status = executionStatus;
+
 			const saveSettings = toSaveSettings(this.workflowData.settings);
 
 			const shouldNotSave =
diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts
index 38ead8896e..6cade903d0 100644
--- a/packages/cli/src/workflow-runner.ts
+++ b/packages/cli/src/workflow-runner.ts
@@ -137,7 +137,10 @@ export class WorkflowRunner {
 			// Create a failed execution with the data for the node, save it and abort execution
 			const runData = generateFailedExecutionFromError(data.executionMode, error, error.node);
 			const workflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
-			await workflowHooks.executeHookFunctions('workflowExecuteBefore', []);
+			await workflowHooks.executeHookFunctions('workflowExecuteBefore', [
+				undefined,
+				data.executionData,
+			]);
 			await workflowHooks.executeHookFunctions('workflowExecuteAfter', [runData]);
 			responsePromise?.reject(error);
 			this.activeExecutions.finalizeExecution(executionId);
@@ -314,8 +317,9 @@ export class WorkflowRunner {
 					workflowExecution = workflowExecute.runPartialWorkflow2(
 						workflow,
 						data.runData,
-						data.destinationNode,
 						data.pinData,
+						data.dirtyNodeNames,
+						data.destinationNode,
 					);
 				} else {
 					workflowExecution = workflowExecute.runPartialWorkflow(
@@ -401,7 +405,7 @@ export class WorkflowRunner {
 
 			// Normally also workflow should be supplied here but as it only used for sending
 			// data to editor-UI is not needed.
-			await hooks.executeHookFunctions('workflowExecuteBefore', []);
+			await hooks.executeHookFunctions('workflowExecuteBefore', [undefined, data.executionData]);
 		} catch (error) {
 			// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
 			// "workflowExecuteAfter" which we require.
diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts
index dd8480d759..d6ef8b4f93 100644
--- a/packages/cli/src/workflows/workflow-execution.service.ts
+++ b/packages/cli/src/workflows/workflow-execution.service.ts
@@ -89,7 +89,13 @@ export class WorkflowExecutionService {
 	}
 
 	async executeManually(
-		{ workflowData, runData, startNodes, destinationNode }: WorkflowRequest.ManualRunPayload,
+		{
+			workflowData,
+			runData,
+			startNodes,
+			destinationNode,
+			dirtyNodeNames,
+		}: WorkflowRequest.ManualRunPayload,
 		user: User,
 		pushRef?: string,
 		partialExecutionVersion?: string,
@@ -137,6 +143,7 @@ export class WorkflowExecutionService {
 			workflowData,
 			userId: user.id,
 			partialExecutionVersion: partialExecutionVersion ?? '0',
+			dirtyNodeNames,
 		};
 
 		const hasRunData = (node: INode) => runData !== undefined && !!runData[node.name];
diff --git a/packages/cli/src/workflows/workflow.request.ts b/packages/cli/src/workflows/workflow.request.ts
index d45cfd14d3..abfb58026a 100644
--- a/packages/cli/src/workflows/workflow.request.ts
+++ b/packages/cli/src/workflows/workflow.request.ts
@@ -22,6 +22,7 @@ export declare namespace WorkflowRequest {
 		runData: IRunData;
 		startNodes?: StartNodeData[];
 		destinationNode?: string;
+		dirtyNodeNames?: string[];
 	};
 
 	type Create = AuthenticatedRequest<{}, {}, CreateUpdatePayload>;
diff --git a/packages/cli/templates/form-trigger-404.handlebars b/packages/cli/templates/form-trigger-404.handlebars
index 234cb0e4dc..db6a9da13b 100644
--- a/packages/cli/templates/form-trigger-404.handlebars
+++ b/packages/cli/templates/form-trigger-404.handlebars
@@ -5,7 +5,7 @@
 		<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'
+			href='https://fonts.googleapis.com/css?family=Open+Sans'
 			rel='stylesheet'
 			type='text/css'
 		/>
@@ -83,4 +83,4 @@
 		</div>
 	</body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/packages/cli/templates/form-trigger-409.handlebars b/packages/cli/templates/form-trigger-409.handlebars
index 6f34e5080d..95c14105d7 100644
--- a/packages/cli/templates/form-trigger-409.handlebars
+++ b/packages/cli/templates/form-trigger-409.handlebars
@@ -5,7 +5,7 @@
 		<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'
+			href='https://fonts.googleapis.com/css?family=Open+Sans'
 			rel='stylesheet'
 			type='text/css'
 		/>
@@ -71,4 +71,4 @@
 		</div>
 	</body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/packages/cli/templates/form-trigger-completion.handlebars b/packages/cli/templates/form-trigger-completion.handlebars
index 761d09937b..49520fd14c 100644
--- a/packages/cli/templates/form-trigger-completion.handlebars
+++ b/packages/cli/templates/form-trigger-completion.handlebars
@@ -5,7 +5,7 @@
 		<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'
+			href='https://fonts.googleapis.com/css?family=Open+Sans'
 			rel='stylesheet'
 			type='text/css'
 		/>
@@ -71,4 +71,4 @@
 		</div>
 	</body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index 02611f5b5b..8d2b13e5a7 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -4,7 +4,7 @@
 		<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'
+			href='https://fonts.googleapis.com/css?family=Open+Sans'
 			rel='stylesheet'
 			type='text/css'
 		/>
diff --git a/packages/cli/templates/send-and-wait-no-action-required.handlebars b/packages/cli/templates/send-and-wait-no-action-required.handlebars
index 7dcf99f10b..ac58775467 100644
--- a/packages/cli/templates/send-and-wait-no-action-required.handlebars
+++ b/packages/cli/templates/send-and-wait-no-action-required.handlebars
@@ -5,7 +5,7 @@
 		<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'
+			href='https://fonts.googleapis.com/css?family=Open+Sans'
 			rel='stylesheet'
 			type='text/css'
 		/>
@@ -70,4 +70,4 @@
 		</div>
 	</body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/packages/cli/test/integration/evaluation/metrics.api.test.ts b/packages/cli/test/integration/evaluation/metrics.api.test.ts
new file mode 100644
index 0000000000..d10bb106a5
--- /dev/null
+++ b/packages/cli/test/integration/evaluation/metrics.api.test.ts
@@ -0,0 +1,381 @@
+import { Container } from 'typedi';
+
+import type { TestDefinition } from '@/databases/entities/test-definition.ee';
+import type { User } from '@/databases/entities/user';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import { TestDefinitionRepository } from '@/databases/repositories/test-definition.repository.ee';
+import { TestMetricRepository } from '@/databases/repositories/test-metric.repository.ee';
+import { createUserShell } from '@test-integration/db/users';
+import { createWorkflow } from '@test-integration/db/workflows';
+import * as testDb from '@test-integration/test-db';
+import type { SuperAgentTest } from '@test-integration/types';
+import * as utils from '@test-integration/utils';
+
+let authOwnerAgent: SuperAgentTest;
+let workflowUnderTest: WorkflowEntity;
+let otherWorkflow: WorkflowEntity;
+let testDefinition: TestDefinition;
+let otherTestDefinition: TestDefinition;
+let ownerShell: User;
+
+const testServer = utils.setupTestServer({ endpointGroups: ['evaluation'] });
+
+beforeAll(async () => {
+	ownerShell = await createUserShell('global:owner');
+	authOwnerAgent = testServer.authAgentFor(ownerShell);
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['TestDefinition', 'TestMetric']);
+
+	workflowUnderTest = await createWorkflow({ name: 'workflow-under-test' }, ownerShell);
+
+	testDefinition = Container.get(TestDefinitionRepository).create({
+		name: 'test',
+		workflow: { id: workflowUnderTest.id },
+	});
+	await Container.get(TestDefinitionRepository).save(testDefinition);
+
+	otherWorkflow = await createWorkflow({ name: 'other-workflow' });
+
+	otherTestDefinition = Container.get(TestDefinitionRepository).create({
+		name: 'other-test',
+		workflow: { id: otherWorkflow.id },
+	});
+	await Container.get(TestDefinitionRepository).save(otherTestDefinition);
+});
+
+describe('GET /evaluation/test-definitions/:testDefinitionId/metrics', () => {
+	test('should retrieve empty list of metrics for a test definition', async () => {
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/metrics`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.length).toBe(0);
+	});
+
+	test('should retrieve metrics for a test definition', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: testDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const newMetric2 = Container.get(TestMetricRepository).create({
+			testDefinition: { id: testDefinition.id },
+			name: 'metric-2',
+		});
+		await Container.get(TestMetricRepository).save(newMetric2);
+
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/metrics`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.length).toBe(2);
+		expect(resp.body.data).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					id: expect.any(String),
+					name: 'metric-1',
+				}),
+				expect.objectContaining({
+					id: expect.any(String),
+					name: 'metric-2',
+				}),
+			]),
+		);
+	});
+
+	test('should return 404 if test definition does not exist', async () => {
+		const resp = await authOwnerAgent.get('/evaluation/test-definitions/999/metrics');
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if test definition is not accessible to the user', async () => {
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${otherTestDefinition.id}/metrics`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
+
+describe('GET /evaluation/test-definitions/:testDefinitionId/metrics/:id', () => {
+	test('should retrieve a metric for a test definition', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: testDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/metrics/${newMetric.id}`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual(
+			expect.objectContaining({
+				id: newMetric.id,
+				name: 'metric-1',
+			}),
+		);
+	});
+
+	test('should return 404 if metric does not exist', async () => {
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/metrics/999`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if metric is not accessible to the user', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: otherTestDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${otherTestDefinition.id}/metrics/${newMetric.id}`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
+
+describe('POST /evaluation/test-definitions/:testDefinitionId/metrics', () => {
+	test('should create a metric for a test definition', async () => {
+		const resp = await authOwnerAgent
+			.post(`/evaluation/test-definitions/${testDefinition.id}/metrics`)
+			.send({
+				name: 'metric-1',
+			});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual(
+			expect.objectContaining({
+				id: expect.any(String),
+				name: 'metric-1',
+			}),
+		);
+
+		const metrics = await Container.get(TestMetricRepository).find({
+			where: { testDefinition: { id: testDefinition.id } },
+		});
+		expect(metrics.length).toBe(1);
+		expect(metrics[0].name).toBe('metric-1');
+	});
+
+	test('should return 400 if name is missing', async () => {
+		const resp = await authOwnerAgent
+			.post(`/evaluation/test-definitions/${testDefinition.id}/metrics`)
+			.send({});
+
+		expect(resp.statusCode).toBe(400);
+		expect(resp.body.errors).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					code: 'invalid_type',
+					message: 'Required',
+					path: ['name'],
+				}),
+			]),
+		);
+	});
+
+	test('should return 400 if name is not a string', async () => {
+		const resp = await authOwnerAgent
+			.post(`/evaluation/test-definitions/${testDefinition.id}/metrics`)
+			.send({
+				name: 123,
+			});
+
+		expect(resp.statusCode).toBe(400);
+		expect(resp.body.errors).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					code: 'invalid_type',
+					message: 'Expected string, received number',
+					path: ['name'],
+				}),
+			]),
+		);
+	});
+
+	test('should return 404 if test definition does not exist', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions/999/metrics').send({
+			name: 'metric-1',
+		});
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if test definition is not accessible to the user', async () => {
+		const resp = await authOwnerAgent
+			.post(`/evaluation/test-definitions/${otherTestDefinition.id}/metrics`)
+			.send({
+				name: 'metric-1',
+			});
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
+
+describe('PATCH /evaluation/test-definitions/:testDefinitionId/metrics/:id', () => {
+	test('should update a metric for a test definition', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: testDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const resp = await authOwnerAgent
+			.patch(`/evaluation/test-definitions/${testDefinition.id}/metrics/${newMetric.id}`)
+			.send({
+				name: 'metric-2',
+			});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual(
+			expect.objectContaining({
+				id: newMetric.id,
+				name: 'metric-2',
+			}),
+		);
+
+		const metrics = await Container.get(TestMetricRepository).find({
+			where: { testDefinition: { id: testDefinition.id } },
+		});
+		expect(metrics.length).toBe(1);
+		expect(metrics[0].name).toBe('metric-2');
+	});
+
+	test('should return 400 if name is missing', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: testDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const resp = await authOwnerAgent
+			.patch(`/evaluation/test-definitions/${testDefinition.id}/metrics/${newMetric.id}`)
+			.send({});
+
+		expect(resp.statusCode).toBe(400);
+		expect(resp.body.errors).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					code: 'invalid_type',
+					message: 'Required',
+					path: ['name'],
+				}),
+			]),
+		);
+	});
+
+	test('should return 400 if name is not a string', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: testDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const resp = await authOwnerAgent
+			.patch(`/evaluation/test-definitions/${testDefinition.id}/metrics/${newMetric.id}`)
+			.send({
+				name: 123,
+			});
+
+		expect(resp.statusCode).toBe(400);
+		expect(resp.body.errors).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					code: 'invalid_type',
+					message: 'Expected string, received number',
+				}),
+			]),
+		);
+	});
+
+	test('should return 404 if metric does not exist', async () => {
+		const resp = await authOwnerAgent
+			.patch(`/evaluation/test-definitions/${testDefinition.id}/metrics/999`)
+			.send({
+				name: 'metric-1',
+			});
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if test definition does not exist', async () => {
+		const resp = await authOwnerAgent.patch('/evaluation/test-definitions/999/metrics/999').send({
+			name: 'metric-1',
+		});
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if metric is not accessible to the user', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: otherTestDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const resp = await authOwnerAgent
+			.patch(`/evaluation/test-definitions/${otherTestDefinition.id}/metrics/${newMetric.id}`)
+			.send({
+				name: 'metric-2',
+			});
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
+
+describe('DELETE /evaluation/test-definitions/:testDefinitionId/metrics/:id', () => {
+	test('should delete a metric for a test definition', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: testDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const resp = await authOwnerAgent.delete(
+			`/evaluation/test-definitions/${testDefinition.id}/metrics/${newMetric.id}`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual({ success: true });
+
+		const metrics = await Container.get(TestMetricRepository).find({
+			where: { testDefinition: { id: testDefinition.id } },
+		});
+		expect(metrics.length).toBe(0);
+	});
+
+	test('should return 404 if metric does not exist', async () => {
+		const resp = await authOwnerAgent.delete(
+			`/evaluation/test-definitions/${testDefinition.id}/metrics/999`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if metric is not accessible to the user', async () => {
+		const newMetric = Container.get(TestMetricRepository).create({
+			testDefinition: { id: otherTestDefinition.id },
+			name: 'metric-1',
+		});
+		await Container.get(TestMetricRepository).save(newMetric);
+
+		const resp = await authOwnerAgent.delete(
+			`/evaluation/test-definitions/${otherTestDefinition.id}/metrics/${newMetric.id}`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
diff --git a/packages/cli/test/integration/evaluation/test-definitions.api.test.ts b/packages/cli/test/integration/evaluation/test-definitions.api.test.ts
index 3309bc08d4..b644cbe4ea 100644
--- a/packages/cli/test/integration/evaluation/test-definitions.api.test.ts
+++ b/packages/cli/test/integration/evaluation/test-definitions.api.test.ts
@@ -1,9 +1,11 @@
+import { mockInstance } from 'n8n-core/test/utils';
 import { Container } from 'typedi';
 
 import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
 import type { User } from '@/databases/entities/user';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { TestDefinitionRepository } from '@/databases/repositories/test-definition.repository.ee';
+import { TestRunnerService } from '@/evaluation/test-runner/test-runner.service.ee';
 import { createAnnotationTags } from '@test-integration/db/executions';
 
 import { createUserShell } from './../shared/db/users';
@@ -12,8 +14,11 @@ import * as testDb from './../shared/test-db';
 import type { SuperAgentTest } from './../shared/types';
 import * as utils from './../shared/utils/';
 
+const testRunner = mockInstance(TestRunnerService);
+
 let authOwnerAgent: SuperAgentTest;
 let workflowUnderTest: WorkflowEntity;
+let workflowUnderTest2: WorkflowEntity;
 let evaluationWorkflow: WorkflowEntity;
 let otherWorkflow: WorkflowEntity;
 let ownerShell: User;
@@ -29,6 +34,7 @@ beforeEach(async () => {
 	await testDb.truncate(['TestDefinition', 'Workflow', 'AnnotationTag']);
 
 	workflowUnderTest = await createWorkflow({ name: 'workflow-under-test' }, ownerShell);
+	workflowUnderTest2 = await createWorkflow({ name: 'workflow-under-test-2' }, ownerShell);
 	evaluationWorkflow = await createWorkflow({ name: 'evaluation-workflow' }, ownerShell);
 	otherWorkflow = await createWorkflow({ name: 'other-workflow' });
 	annotationTag = (await createAnnotationTags(['test-tag']))[0];
@@ -90,6 +96,44 @@ describe('GET /evaluation/test-definitions', () => {
 		expect(resp.body.data.count).toBe(15);
 		expect(resp.body.data.testDefinitions).toHaveLength(5);
 	});
+
+	test('should retrieve test definitions list for a workflow', async () => {
+		// Add a bunch of test definitions for two different workflows
+		const testDefinitions = [];
+
+		for (let i = 0; i < 15; i++) {
+			const newTest = Container.get(TestDefinitionRepository).create({
+				name: `test-${i}`,
+				workflow: { id: workflowUnderTest.id },
+			});
+
+			const newTest2 = Container.get(TestDefinitionRepository).create({
+				name: `test-${i * 2}`,
+				workflow: { id: workflowUnderTest2.id },
+			});
+
+			testDefinitions.push(newTest, newTest2);
+		}
+
+		await Container.get(TestDefinitionRepository).save(testDefinitions);
+
+		// Fetch test definitions of a second workflow
+		let resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions?filter=${JSON.stringify({ workflowId: workflowUnderTest2.id })}`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.count).toBe(15);
+	});
+
+	test('should return error if user has no access to the workflowId specified in filter', async () => {
+		let resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions?filter=${JSON.stringify({ workflowId: otherWorkflow.id })}`,
+		);
+
+		expect(resp.statusCode).toBe(403);
+		expect(resp.body.message).toBe('User does not have access to the workflow');
+	});
 });
 
 describe('GET /evaluation/test-definitions/:id', () => {
@@ -386,3 +430,24 @@ describe('DELETE /evaluation/test-definitions/:id', () => {
 		expect(resp.body.message).toBe('Test definition not found');
 	});
 });
+
+describe('POST /evaluation/test-definitions/:id/run', () => {
+	test('should trigger the test run', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.post(`/evaluation/test-definitions/${newTest.id}/run`);
+
+		expect(resp.statusCode).toBe(202);
+		expect(resp.body).toEqual(
+			expect.objectContaining({
+				success: true,
+			}),
+		);
+
+		expect(testRunner.runTest).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts
index 4d7144cd4d..27163b3bea 100644
--- a/packages/cli/test/integration/execution.service.integration.test.ts
+++ b/packages/cli/test/integration/execution.service.integration.test.ts
@@ -327,6 +327,95 @@ describe('ExecutionService', () => {
 			});
 		});
 
+		test('should filter executions by `projectId` and expected `status`', 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: 'error' }, firstWorkflow);
+			await createExecution({ status: 'success' }, secondWorkflow);
+
+			const query: ExecutionSummaries.RangeQuery = {
+				kind: 'range',
+				range: { limit: 20 },
+				accessibleWorkflowIds: [firstWorkflow.id],
+				projectId: firstProject.id,
+				status: ['error'],
+			};
+
+			const output = await executionService.findRangeWithCount(query);
+
+			expect(output).toEqual({
+				count: 1,
+				estimated: false,
+				results: expect.arrayContaining([
+					expect.objectContaining({ workflowId: firstWorkflow.id, status: 'error' }),
+				]),
+			});
+		});
+
+		test.each([
+			{
+				name: 'waitTill',
+				filter: { waitTill: true },
+				matchingParams: { waitTill: new Date() },
+				nonMatchingParams: { waitTill: undefined },
+			},
+			{
+				name: 'metadata',
+				filter: { metadata: [{ key: 'testKey', value: 'testValue' }] },
+				matchingParams: { metadata: [{ key: 'testKey', value: 'testValue' }] },
+				nonMatchingParams: { metadata: [{ key: 'otherKey', value: 'otherValue' }] },
+			},
+			{
+				name: 'startedAfter',
+				filter: { startedAfter: '2023-01-01' },
+				matchingParams: { startedAt: new Date('2023-06-01') },
+				nonMatchingParams: { startedAt: new Date('2022-01-01') },
+			},
+			{
+				name: 'startedBefore',
+				filter: { startedBefore: '2023-12-31' },
+				matchingParams: { startedAt: new Date('2023-06-01') },
+				nonMatchingParams: { startedAt: new Date('2024-01-01') },
+			},
+		])(
+			'should filter executions by `projectId` and expected `$name`',
+			async ({ filter, matchingParams, nonMatchingParams }) => {
+				const firstProject = await createTeamProject();
+				const secondProject = await createTeamProject();
+
+				const firstWorkflow = await createWorkflow(undefined, firstProject);
+				const secondWorkflow = await createWorkflow(undefined, secondProject);
+
+				await Promise.all([
+					createExecution(matchingParams, firstWorkflow),
+					createExecution(nonMatchingParams, secondWorkflow),
+				]);
+
+				const query: ExecutionSummaries.RangeQuery = {
+					kind: 'range',
+					range: { limit: 20 },
+					accessibleWorkflowIds: [firstWorkflow.id],
+					projectId: firstProject.id,
+					...filter,
+				};
+
+				const output = await executionService.findRangeWithCount(query);
+
+				expect(output).toEqual({
+					count: 1,
+					estimated: false,
+					results: expect.arrayContaining([
+						expect.objectContaining({ workflowId: firstWorkflow.id }),
+					]),
+				});
+			},
+		);
+
 		test('should exclude executions by inaccessible `workflowId`', async () => {
 			const accessibleWorkflow = await createWorkflow();
 			const inaccessibleWorkflow = await createWorkflow();
diff --git a/packages/cli/test/integration/runners/task-runner-module.internal.test.ts b/packages/cli/test/integration/runners/task-runner-module.internal.test.ts
index cb993f0a87..db195001a7 100644
--- a/packages/cli/test/integration/runners/task-runner-module.internal.test.ts
+++ b/packages/cli/test/integration/runners/task-runner-module.internal.test.ts
@@ -10,6 +10,7 @@ describe('TaskRunnerModule in internal mode', () => {
 	const runnerConfig = Container.get(TaskRunnersConfig);
 	runnerConfig.port = 0; // Random port
 	runnerConfig.mode = 'internal';
+	runnerConfig.enabled = true;
 	const module = Container.get(TaskRunnerModule);
 
 	afterEach(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
index df2fe8fc75..3b6c8aec8c 100644
--- a/packages/cli/test/integration/runners/task-runner-process.test.ts
+++ b/packages/cli/test/integration/runners/task-runner-process.test.ts
@@ -1,21 +1,15 @@
-import { TaskRunnersConfig } from '@n8n/config';
 import Container from 'typedi';
 
 import { TaskRunnerWsServer } 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';
+import { setupBrokerTestServer } from '@test-integration/utils/task-broker-test-server';
 
 describe('TaskRunnerProcess', () => {
-	const authToken = 'token';
-	const runnerConfig = Container.get(TaskRunnersConfig);
-	runnerConfig.enabled = true;
-	runnerConfig.mode = 'internal';
-	runnerConfig.authToken = authToken;
-	runnerConfig.port = 0; // Use any port
-	const taskRunnerServer = Container.get(TaskRunnerServer);
-
+	const { config, server: taskRunnerServer } = setupBrokerTestServer({
+		mode: 'internal',
+	});
 	const runnerProcess = Container.get(TaskRunnerProcess);
 	const taskBroker = Container.get(TaskBroker);
 	const taskRunnerService = Container.get(TaskRunnerWsServer);
@@ -23,7 +17,7 @@ describe('TaskRunnerProcess', () => {
 	beforeAll(async () => {
 		await taskRunnerServer.start();
 		// Set the port to the actually used port
-		runnerConfig.port = taskRunnerServer.port;
+		config.port = taskRunnerServer.port;
 	});
 
 	afterAll(async () => {
diff --git a/packages/cli/test/integration/runners/task-runner-server.test.ts b/packages/cli/test/integration/runners/task-runner-server.test.ts
new file mode 100644
index 0000000000..11d77b53fc
--- /dev/null
+++ b/packages/cli/test/integration/runners/task-runner-server.test.ts
@@ -0,0 +1,22 @@
+import { setupBrokerTestServer } from '@test-integration/utils/task-broker-test-server';
+
+describe('TaskRunnerServer', () => {
+	const { agent, server } = setupBrokerTestServer({
+		authToken: 'token',
+		mode: 'external',
+	});
+
+	beforeAll(async () => {
+		await server.start();
+	});
+
+	afterAll(async () => {
+		await server.stop();
+	});
+
+	describe('/healthz', () => {
+		it('should return 200', async () => {
+			await agent.get('/healthz').expect(200);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/shared/test-db.ts b/packages/cli/test/integration/shared/test-db.ts
index e85825115e..5b70db3be2 100644
--- a/packages/cli/test/integration/shared/test-db.ts
+++ b/packages/cli/test/integration/shared/test-db.ts
@@ -75,6 +75,7 @@ const repositories = [
 	'SharedWorkflow',
 	'Tag',
 	'TestDefinition',
+	'TestMetric',
 	'User',
 	'Variables',
 	'Webhook',
diff --git a/packages/cli/test/integration/shared/utils/task-broker-test-server.ts b/packages/cli/test/integration/shared/utils/task-broker-test-server.ts
new file mode 100644
index 0000000000..9363fc089e
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/task-broker-test-server.ts
@@ -0,0 +1,40 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import request from 'supertest';
+import type TestAgent from 'supertest/lib/agent';
+import Container from 'typedi';
+
+import { TaskRunnerServer } from '@/runners/task-runner-server';
+
+export interface TestTaskBrokerServer {
+	server: TaskRunnerServer;
+	agent: TestAgent;
+	config: TaskRunnersConfig;
+}
+
+/**
+ * Sets up a Task Broker Server for testing purposes. The server needs
+ * to be started and stopped manually.
+ *
+ * @example
+ * const { server, agent, config } = setupBrokerTestServer();
+ *
+ * beforeAll(async () => await server.start());
+ * afterAll(async () => await server.stop());
+ */
+export const setupBrokerTestServer = (
+	config: Partial<TaskRunnersConfig> = {},
+): TestTaskBrokerServer => {
+	const runnerConfig = Container.get(TaskRunnersConfig);
+	Object.assign(runnerConfig, config);
+	runnerConfig.enabled = true;
+	runnerConfig.port = 0; // Use any port
+
+	const taskRunnerServer = Container.get(TaskRunnerServer);
+	const agent = request.agent(taskRunnerServer.app);
+
+	return {
+		server: taskRunnerServer,
+		agent,
+		config: runnerConfig,
+	};
+};
diff --git a/packages/cli/test/integration/shared/utils/test-server.ts b/packages/cli/test/integration/shared/utils/test-server.ts
index b1e7d8a93c..208e05e0f1 100644
--- a/packages/cli/test/integration/shared/utils/test-server.ts
+++ b/packages/cli/test/integration/shared/utils/test-server.ts
@@ -279,6 +279,7 @@ export const setupTestServer = ({
 						break;
 
 					case 'evaluation':
+						await import('@/evaluation/metrics.controller');
 						await import('@/evaluation/test-definitions.controller.ee');
 						break;
 				}
diff --git a/packages/core/package.json b/packages/core/package.json
index 446569e1c6..cedac2f2f5 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "1.68.0",
+  "version": "1.70.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -47,6 +47,7 @@
     "fast-glob": "catalog:",
     "file-type": "16.5.4",
     "form-data": "catalog:",
+    "iconv-lite": "catalog:",
     "lodash": "catalog:",
     "luxon": "catalog:",
     "mime-types": "2.1.35",
diff --git a/packages/core/src/CreateNodeAsTool.ts b/packages/core/src/CreateNodeAsTool.ts
index 1466f57d09..c569f943ce 100644
--- a/packages/core/src/CreateNodeAsTool.ts
+++ b/packages/core/src/CreateNodeAsTool.ts
@@ -1,5 +1,10 @@
 import { DynamicStructuredTool } from '@langchain/core/tools';
-import type { IExecuteFunctions, INodeParameters, INodeType } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeParameters,
+	INodeType,
+	ISupplyDataFunctions,
+} from 'n8n-workflow';
 import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import { z } from 'zod';
 
@@ -18,13 +23,13 @@ interface FromAIArgument {
  * generating Zod schemas, and creating LangChain tools.
  */
 class AIParametersParser {
-	private ctx: IExecuteFunctions;
+	private ctx: ISupplyDataFunctions;
 
 	/**
 	 * Constructs an instance of AIParametersParser.
 	 * @param ctx The execution context.
 	 */
-	constructor(ctx: IExecuteFunctions) {
+	constructor(ctx: ISupplyDataFunctions) {
 		this.ctx = ctx;
 	}
 
@@ -388,7 +393,7 @@ class AIParametersParser {
 
 				try {
 					// Execute the node with the proxied context
-					const result = await node.execute?.bind(this.ctx)();
+					const result = await node.execute?.bind(this.ctx as IExecuteFunctions)();
 
 					// Process and map the results
 					const mappedResults = result?.[0]?.flatMap((item) => item.json);
@@ -423,7 +428,7 @@ class AIParametersParser {
  * @returns An object containing the DynamicStructuredTool instance.
  */
 export function createNodeAsTool(
-	ctx: IExecuteFunctions,
+	ctx: ISupplyDataFunctions,
 	node: INodeType,
 	nodeParameters: INodeParameters,
 ) {
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 29f60b8979..7ff1645335 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
@@ -29,49 +28,33 @@ import { createReadStream } from 'fs';
 import { access as fsAccess, writeFile as fsWriteFile } from 'fs/promises';
 import { IncomingMessage } from 'http';
 import { Agent, type AgentOptions } from 'https';
+import iconv from 'iconv-lite';
 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';
 import type {
 	BinaryHelperFunctions,
 	CloseFunction,
-	ContextType,
-	ExecuteWorkflowData,
-	FieldType,
 	FileSystemHelperFunctions,
-	FunctionsBase,
 	GenericValue,
 	IAdditionalCredentialOptions,
 	IAllExecuteFunctions,
 	IBinaryData,
-	IContextObject,
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
-	ICredentialsExpressionResolveValues,
 	IDataObject,
 	IExecuteData,
 	IExecuteFunctions,
-	IExecuteResponsePromiseData,
 	IExecuteSingleFunctions,
-	IExecuteWorkflowInfo,
-	IGetNodeParameterOptions,
 	IHookFunctions,
 	IHttpRequestOptions,
 	IN8nHttpFullResponse,
 	IN8nHttpResponse,
 	INode,
-	INodeCredentialDescription,
-	INodeCredentialsDetails,
 	INodeExecutionData,
 	INodeInputConfiguration,
-	INodeOutputConfiguration,
-	INodeProperties,
-	INodePropertyCollection,
-	INodePropertyOptions,
-	INodeType,
 	IOAuth2Options,
 	IPairedItemData,
 	IPollFunctions,
@@ -85,20 +68,15 @@ import type {
 	IWebhookDescription,
 	IWebhookFunctions,
 	IWorkflowDataProxyAdditionalKeys,
-	IWorkflowDataProxyData,
 	IWorkflowExecuteAdditionalData,
 	NodeExecutionWithMetadata,
 	NodeHelperFunctions,
 	NodeParameterValueType,
-	NodeTypeAndVersion,
 	PaginationOptions,
 	RequestHelperFunctions,
 	Workflow,
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
-	CallbackManager,
-	INodeParameters,
-	EnsureTypeOptions,
 	SSHTunnelFunctions,
 	DeduplicationHelperFunctions,
 	IDeduplicationOutput,
@@ -107,27 +85,20 @@ import type {
 	DeduplicationScope,
 	DeduplicationItemTypes,
 	ICheckProcessedContextData,
-	AiEvent,
 	ISupplyDataFunctions,
 	WebhookType,
 	SchedulingFunctions,
-	RelatedExecution,
 } from 'n8n-workflow';
 import {
 	NodeConnectionType,
-	ExpressionError,
 	LoggerProxy as Logger,
 	NodeApiError,
 	NodeHelpers,
 	NodeOperationError,
 	NodeSslError,
-	WorkflowDataProxy,
-	createDeferredPromise,
 	deepCopy,
 	fileTypeFromMimeType,
 	isObjectEmpty,
-	isResourceMapperValue,
-	validateFieldType,
 	ExecutionBaseError,
 	jsonParse,
 	ApplicationError,
@@ -141,7 +112,6 @@ 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';
@@ -150,34 +120,25 @@ import {
 	BLOCK_FILE_ACCESS_TO_N8N_FILES,
 	CONFIG_FILES,
 	CUSTOM_EXTENSION_ENV,
-	HTTP_REQUEST_NODE_TYPE,
-	HTTP_REQUEST_TOOL_NODE_TYPE,
-	PLACEHOLDER_EMPTY_EXECUTION_ID,
 	RESTRICT_FILE_ACCESS_TO,
 	UM_EMAIL_TEMPLATES_INVITE,
 	UM_EMAIL_TEMPLATES_PWRESET,
 } from './Constants';
 import { createNodeAsTool } from './CreateNodeAsTool';
 import { DataDeduplicationService } from './data-deduplication-service';
-import {
-	getAllWorkflowExecutionMetadata,
-	getWorkflowExecutionMetadata,
-	setAllWorkflowExecutionMetadata,
-	setWorkflowExecutionMetadata,
-} from './ExecutionMetadata';
-import { extractValue } from './ExtractValue';
 import { InstanceSettings } from './InstanceSettings';
-import type { ExtendedValidationResult, IResponseError } from './Interfaces';
+import type { IResponseError } from './Interfaces';
 // eslint-disable-next-line import/no-cycle
 import {
+	ExecuteContext,
 	ExecuteSingleContext,
 	HookContext,
 	PollContext,
+	SupplyDataContext,
 	TriggerContext,
 	WebhookContext,
 } from './node-execution-context';
 import { ScheduledTaskManager } from './ScheduledTaskManager';
-import { getSecretsProxy } from './Secrets';
 import { SSHClientsManager } from './SSHClientsManager';
 
 axios.defaults.timeout = 300000;
@@ -714,14 +675,18 @@ function parseHeaderParameters(parameters: string[]): Record<string, string> {
 	return parameters.reduce(
 		(acc, param) => {
 			const [key, value] = param.split('=');
-			acc[key.toLowerCase().trim()] = decodeURIComponent(value);
+			let decodedValue = decodeURIComponent(value).trim();
+			if (decodedValue.startsWith('"') && decodedValue.endsWith('"')) {
+				decodedValue = decodedValue.slice(1, -1);
+			}
+			acc[key.toLowerCase().trim()] = decodedValue;
 			return acc;
 		},
 		{} as Record<string, string>,
 	);
 }
 
-function parseContentType(contentType?: string): IContentType | null {
+export function parseContentType(contentType?: string): IContentType | null {
 	if (!contentType) {
 		return null;
 	}
@@ -734,22 +699,7 @@ function parseContentType(contentType?: string): IContentType | null {
 	};
 }
 
-function parseFileName(filename?: string): string | undefined {
-	if (filename?.startsWith('"') && filename?.endsWith('"')) {
-		return filename.slice(1, -1);
-	}
-
-	return filename;
-}
-
-// https://datatracker.ietf.org/doc/html/rfc5987
-function parseFileNameStar(filename?: string): string | undefined {
-	const [_encoding, _locale, content] = parseFileName(filename)?.split("'") ?? [];
-
-	return content;
-}
-
-function parseContentDisposition(contentDisposition?: string): IContentDisposition | null {
+export function parseContentDisposition(contentDisposition?: string): IContentDisposition | null {
 	if (!contentDisposition) {
 		return null;
 	}
@@ -764,11 +714,15 @@ function parseContentDisposition(contentDisposition?: string): IContentDispositi
 
 	const parsedParameters = parseHeaderParameters(parameters);
 
-	return {
-		type,
-		filename:
-			parseFileNameStar(parsedParameters['filename*']) ?? parseFileName(parsedParameters.filename),
-	};
+	let { filename } = parsedParameters;
+	const wildcard = parsedParameters['filename*'];
+	if (wildcard) {
+		// https://datatracker.ietf.org/doc/html/rfc5987
+		const [_encoding, _locale, content] = wildcard?.split("'") ?? [];
+		filename = content;
+	}
+
+	return { type, filename };
 }
 
 export function parseIncomingMessage(message: IncomingMessage) {
@@ -785,13 +739,13 @@ export function parseIncomingMessage(message: IncomingMessage) {
 	}
 }
 
-export async function binaryToString(body: Buffer | Readable, encoding?: BufferEncoding) {
-	const buffer = await binaryToBuffer(body);
+export async function binaryToString(body: Buffer | Readable, encoding?: string) {
 	if (!encoding && body instanceof IncomingMessage) {
 		parseIncomingMessage(body);
 		encoding = body.encoding;
 	}
-	return buffer.toString(encoding);
+	const buffer = await binaryToBuffer(body);
+	return iconv.decode(buffer, encoding ?? 'utf-8');
 }
 
 export async function proxyRequestToAxios(
@@ -2022,630 +1976,8 @@ export async function requestWithAuthentication(
 	}
 }
 
-/**
- * Returns the additional keys for Expressions and Function-Nodes
- *
- */
-export function getAdditionalKeys(
-	additionalData: IWorkflowExecuteAdditionalData,
-	mode: WorkflowExecuteMode,
-	runExecutionData: IRunExecutionData | null,
-	options?: { secretsEnabled?: boolean },
-): IWorkflowDataProxyAdditionalKeys {
-	const executionId = additionalData.executionId || PLACEHOLDER_EMPTY_EXECUTION_ID;
-	const resumeUrl = `${additionalData.webhookWaitingBaseUrl}/${executionId}`;
-	const resumeFormUrl = `${additionalData.formWaitingBaseUrl}/${executionId}`;
-	return {
-		$execution: {
-			id: executionId,
-			mode: mode === 'manual' ? 'test' : 'production',
-			resumeUrl,
-			resumeFormUrl,
-			customData: runExecutionData
-				? {
-						set(key: string, value: string): void {
-							try {
-								setWorkflowExecutionMetadata(runExecutionData, key, value);
-							} catch (e) {
-								if (mode === 'manual') {
-									throw e;
-								}
-								Logger.debug(e.message);
-							}
-						},
-						setAll(obj: Record<string, string>): void {
-							try {
-								setAllWorkflowExecutionMetadata(runExecutionData, obj);
-							} catch (e) {
-								if (mode === 'manual') {
-									throw e;
-								}
-								Logger.debug(e.message);
-							}
-						},
-						get(key: string): string {
-							return getWorkflowExecutionMetadata(runExecutionData, key);
-						},
-						getAll(): Record<string, string> {
-							return getAllWorkflowExecutionMetadata(runExecutionData);
-						},
-					}
-				: undefined,
-		},
-		$vars: additionalData.variables,
-		$secrets: options?.secretsEnabled ? getSecretsProxy(additionalData) : undefined,
-
-		// deprecated
-		$executionId: executionId,
-		$resumeWebhookUrl: resumeUrl,
-	};
-}
-
-/**
- * Returns the requested decrypted credentials if the node has access to them.
- *
- * @param {Workflow} workflow Workflow which requests the data
- * @param {INode} node Node which request the data
- * @param {string} type The credential type to return
- */
-export async function getCredentials<T extends object = ICredentialDataDecryptedObject>(
-	workflow: Workflow,
-	node: INode,
-	type: string,
-	additionalData: IWorkflowExecuteAdditionalData,
-	mode: WorkflowExecuteMode,
-	executeData?: IExecuteData,
-	runExecutionData?: IRunExecutionData | null,
-	runIndex?: number,
-	connectionInputData?: INodeExecutionData[],
-	itemIndex?: number,
-): Promise<T> {
-	// Get the NodeType as it has the information if the credentials are required
-	const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-	if (nodeType === undefined) {
-		throw new NodeOperationError(
-			node,
-			`Node type "${node.type}" is not known so can not get credentials`,
-		);
-	}
-
-	// Hardcode for now for security reasons that only a single node can access
-	// all credentials
-	const fullAccess = [HTTP_REQUEST_NODE_TYPE, HTTP_REQUEST_TOOL_NODE_TYPE].includes(node.type);
-
-	let nodeCredentialDescription: INodeCredentialDescription | undefined;
-	if (!fullAccess) {
-		if (nodeType.description.credentials === undefined) {
-			throw new NodeOperationError(
-				node,
-				`Node type "${node.type}" does not have any credentials defined`,
-				{ level: 'warning' },
-			);
-		}
-
-		nodeCredentialDescription = nodeType.description.credentials.find(
-			(credentialTypeDescription) => credentialTypeDescription.name === type,
-		);
-		if (nodeCredentialDescription === undefined) {
-			throw new NodeOperationError(
-				node,
-				`Node type "${node.type}" does not have any credentials of type "${type}" defined`,
-				{ level: 'warning' },
-			);
-		}
-
-		if (
-			!NodeHelpers.displayParameter(
-				additionalData.currentNodeParameters || node.parameters,
-				nodeCredentialDescription,
-				node,
-				node.parameters,
-			)
-		) {
-			// Credentials should not be displayed even if they would be defined
-			throw new NodeOperationError(node, 'Credentials not found');
-		}
-	}
-
-	// Check if node has any credentials defined
-	if (!fullAccess && !node.credentials?.[type]) {
-		// If none are defined check if the credentials are required or not
-
-		if (nodeCredentialDescription?.required === true) {
-			// Credentials are required so error
-			if (!node.credentials) {
-				throw new NodeOperationError(node, 'Node does not have any credentials set', {
-					level: 'warning',
-				});
-			}
-			if (!node.credentials[type]) {
-				throw new NodeOperationError(node, `Node does not have any credentials set for "${type}"`, {
-					level: 'warning',
-				});
-			}
-		} else {
-			// Credentials are not required
-			throw new NodeOperationError(node, 'Node does not require credentials');
-		}
-	}
-
-	if (fullAccess && !node.credentials?.[type]) {
-		// Make sure that fullAccess nodes still behave like before that if they
-		// request access to credentials that are currently not set it returns undefined
-		throw new NodeOperationError(node, 'Credentials not found');
-	}
-
-	let expressionResolveValues: ICredentialsExpressionResolveValues | undefined;
-	if (connectionInputData && runExecutionData && runIndex !== undefined) {
-		expressionResolveValues = {
-			connectionInputData,
-			itemIndex: itemIndex || 0,
-			node,
-			runExecutionData,
-			runIndex,
-			workflow,
-		} as ICredentialsExpressionResolveValues;
-	}
-
-	const nodeCredentials = node.credentials
-		? node.credentials[type]
-		: ({} as INodeCredentialsDetails);
-
-	// TODO: solve using credentials via expression
-	// if (name.charAt(0) === '=') {
-	// 	// If the credential name is an expression resolve it
-	// 	const additionalKeys = getAdditionalKeys(additionalData, mode);
-	// 	name = workflow.expression.getParameterValue(
-	// 		name,
-	// 		runExecutionData || null,
-	// 		runIndex || 0,
-	// 		itemIndex || 0,
-	// 		node.name,
-	// 		connectionInputData || [],
-	// 		mode,
-	// 		additionalKeys,
-	// 	) as string;
-	// }
-
-	const decryptedDataObject = await additionalData.credentialsHelper.getDecrypted(
-		additionalData,
-		nodeCredentials,
-		type,
-		mode,
-		executeData,
-		false,
-		expressionResolveValues,
-	);
-
-	return decryptedDataObject as T;
-}
-
-/**
- * Clean up parameter data to make sure that only valid data gets returned
- * INFO: Currently only converts Luxon Dates as we know for sure it will not be breaking
- */
-export function cleanupParameterData(inputData: NodeParameterValueType): void {
-	if (typeof inputData !== 'object' || inputData === null) {
-		return;
-	}
-
-	if (Array.isArray(inputData)) {
-		inputData.forEach((value) => cleanupParameterData(value as NodeParameterValueType));
-		return;
-	}
-
-	if (typeof inputData === 'object') {
-		Object.keys(inputData).forEach((key) => {
-			const value = (inputData as INodeParameters)[key];
-			if (typeof value === 'object') {
-				if (DateTime.isDateTime(value)) {
-					// Is a special luxon date so convert to string
-					(inputData as INodeParameters)[key] = value.toString();
-				} else {
-					cleanupParameterData(value);
-				}
-			}
-		});
-	}
-}
-
-const validateResourceMapperValue = (
-	parameterName: string,
-	paramValues: { [key: string]: unknown },
-	node: INode,
-	skipRequiredCheck = false,
-): ExtendedValidationResult => {
-	const result: ExtendedValidationResult = { valid: true, newValue: paramValues };
-	const paramNameParts = parameterName.split('.');
-	if (paramNameParts.length !== 2) {
-		return result;
-	}
-	const resourceMapperParamName = paramNameParts[0];
-	const resourceMapperField = node.parameters[resourceMapperParamName];
-	if (!resourceMapperField || !isResourceMapperValue(resourceMapperField)) {
-		return result;
-	}
-	const schema = resourceMapperField.schema;
-	const paramValueNames = Object.keys(paramValues);
-	for (let i = 0; i < paramValueNames.length; i++) {
-		const key = paramValueNames[i];
-		const resolvedValue = paramValues[key];
-		const schemaEntry = schema.find((s) => s.id === key);
-
-		if (
-			!skipRequiredCheck &&
-			schemaEntry?.required === true &&
-			schemaEntry.type !== 'boolean' &&
-			!resolvedValue
-		) {
-			return {
-				valid: false,
-				errorMessage: `The value "${String(key)}" is required but not set`,
-				fieldName: key,
-			};
-		}
-
-		if (schemaEntry?.type) {
-			const validationResult = validateFieldType(key, resolvedValue, schemaEntry.type, {
-				valueOptions: schemaEntry.options,
-			});
-			if (!validationResult.valid) {
-				return { ...validationResult, fieldName: key };
-			} else {
-				// If it's valid, set the casted value
-				paramValues[key] = validationResult.newValue;
-			}
-		}
-	}
-	return result;
-};
-
-const validateCollection = (
-	node: INode,
-	runIndex: number,
-	itemIndex: number,
-	propertyDescription: INodeProperties,
-	parameterPath: string[],
-	validationResult: ExtendedValidationResult,
-): ExtendedValidationResult => {
-	let nestedDescriptions: INodeProperties[] | undefined;
-
-	if (propertyDescription.type === 'fixedCollection') {
-		nestedDescriptions = (propertyDescription.options as INodePropertyCollection[]).find(
-			(entry) => entry.name === parameterPath[1],
-		)?.values;
-	}
-
-	if (propertyDescription.type === 'collection') {
-		nestedDescriptions = propertyDescription.options as INodeProperties[];
-	}
-
-	if (!nestedDescriptions) {
-		return validationResult;
-	}
-
-	const validationMap: {
-		[key: string]: { type: FieldType; displayName: string; options?: INodePropertyOptions[] };
-	} = {};
-
-	for (const prop of nestedDescriptions) {
-		if (!prop.validateType || prop.ignoreValidationDuringExecution) continue;
-
-		validationMap[prop.name] = {
-			type: prop.validateType,
-			displayName: prop.displayName,
-			options:
-				prop.validateType === 'options' ? (prop.options as INodePropertyOptions[]) : undefined,
-		};
-	}
-
-	if (!Object.keys(validationMap).length) {
-		return validationResult;
-	}
-
-	if (validationResult.valid) {
-		for (const value of Array.isArray(validationResult.newValue)
-			? (validationResult.newValue as IDataObject[])
-			: [validationResult.newValue as IDataObject]) {
-			for (const key of Object.keys(value)) {
-				if (!validationMap[key]) continue;
-
-				const fieldValidationResult = validateFieldType(key, value[key], validationMap[key].type, {
-					valueOptions: validationMap[key].options,
-				});
-
-				if (!fieldValidationResult.valid) {
-					throw new ExpressionError(
-						`Invalid input for field '${validationMap[key].displayName}' inside '${propertyDescription.displayName}' in [item ${itemIndex}]`,
-						{
-							description: fieldValidationResult.errorMessage,
-							runIndex,
-							itemIndex,
-							nodeCause: node.name,
-						},
-					);
-				}
-				value[key] = fieldValidationResult.newValue;
-			}
-		}
-	}
-
-	return validationResult;
-};
-
-export const validateValueAgainstSchema = (
-	node: INode,
-	nodeType: INodeType,
-	parameterValue: string | number | boolean | object | null | undefined,
-	parameterName: string,
-	runIndex: number,
-	itemIndex: number,
-) => {
-	const parameterPath = parameterName.split('.');
-
-	const propertyDescription = nodeType.description.properties.find(
-		(prop) =>
-			parameterPath[0] === prop.name && NodeHelpers.displayParameter(node.parameters, prop, node),
-	);
-
-	if (!propertyDescription) {
-		return parameterValue;
-	}
-
-	let validationResult: ExtendedValidationResult = { valid: true, newValue: parameterValue };
-
-	if (
-		parameterPath.length === 1 &&
-		propertyDescription.validateType &&
-		!propertyDescription.ignoreValidationDuringExecution
-	) {
-		validationResult = validateFieldType(
-			parameterName,
-			parameterValue,
-			propertyDescription.validateType,
-		);
-	} else if (
-		propertyDescription.type === 'resourceMapper' &&
-		parameterPath[1] === 'value' &&
-		typeof parameterValue === 'object'
-	) {
-		validationResult = validateResourceMapperValue(
-			parameterName,
-			parameterValue as { [key: string]: unknown },
-			node,
-			propertyDescription.typeOptions?.resourceMapper?.mode !== 'add',
-		);
-	} else if (['fixedCollection', 'collection'].includes(propertyDescription.type)) {
-		validationResult = validateCollection(
-			node,
-			runIndex,
-			itemIndex,
-			propertyDescription,
-			parameterPath,
-			validationResult,
-		);
-	}
-
-	if (!validationResult.valid) {
-		throw new ExpressionError(
-			`Invalid input for '${
-				validationResult.fieldName
-					? String(validationResult.fieldName)
-					: propertyDescription.displayName
-			}' [item ${itemIndex}]`,
-			{
-				description: validationResult.errorMessage,
-				runIndex,
-				itemIndex,
-				nodeCause: node.name,
-			},
-		);
-	}
-	return validationResult.newValue;
-};
-
-export function ensureType(
-	toType: EnsureTypeOptions,
-	parameterValue: any,
-	parameterName: string,
-	errorOptions?: { itemIndex?: number; runIndex?: number; nodeCause?: string },
-): string | number | boolean | object {
-	let returnData = parameterValue;
-
-	if (returnData === null) {
-		throw new ExpressionError(`Parameter '${parameterName}' must not be null`, errorOptions);
-	}
-
-	if (returnData === undefined) {
-		throw new ExpressionError(
-			`Parameter '${parameterName}' could not be 'undefined'`,
-			errorOptions,
-		);
-	}
-
-	if (['object', 'array', 'json'].includes(toType)) {
-		if (typeof returnData !== 'object') {
-			// if value is not an object and is string try to parse it, else throw an error
-			if (typeof returnData === 'string' && returnData.length) {
-				try {
-					const parsedValue = JSON.parse(returnData);
-					returnData = parsedValue;
-				} catch (error) {
-					throw new ExpressionError(`Parameter '${parameterName}' could not be parsed`, {
-						...errorOptions,
-						description: error.message,
-					});
-				}
-			} else {
-				throw new ExpressionError(
-					`Parameter '${parameterName}' must be an ${toType}, but we got '${String(parameterValue)}'`,
-					errorOptions,
-				);
-			}
-		} else if (toType === 'json') {
-			// value is an object, make sure it is valid JSON
-			try {
-				JSON.stringify(returnData);
-			} catch (error) {
-				throw new ExpressionError(`Parameter '${parameterName}' is not valid JSON`, {
-					...errorOptions,
-					description: error.message,
-				});
-			}
-		}
-
-		if (toType === 'array' && !Array.isArray(returnData)) {
-			// value is not an array, but has to be
-			throw new ExpressionError(
-				`Parameter '${parameterName}' must be an array, but we got object`,
-				errorOptions,
-			);
-		}
-	}
-
-	try {
-		if (toType === 'string') {
-			if (typeof returnData === 'object') {
-				returnData = JSON.stringify(returnData);
-			} else {
-				returnData = String(returnData);
-			}
-		}
-
-		if (toType === 'number') {
-			returnData = Number(returnData);
-			if (Number.isNaN(returnData)) {
-				throw new ExpressionError(
-					`Parameter '${parameterName}' must be a number, but we got '${parameterValue}'`,
-					errorOptions,
-				);
-			}
-		}
-
-		if (toType === 'boolean') {
-			returnData = Boolean(returnData);
-		}
-	} catch (error) {
-		if (error instanceof ExpressionError) throw error;
-
-		throw new ExpressionError(`Parameter '${parameterName}' could not be converted to ${toType}`, {
-			...errorOptions,
-			description: error.message,
-		});
-	}
-
-	return returnData;
-}
-
-/**
- * Returns the requested resolved (all expressions replaced) node parameters.
- *
- * @param {(IRunExecutionData | null)} runExecutionData
- */
-export function getNodeParameter(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData | null,
-	runIndex: number,
-	connectionInputData: INodeExecutionData[],
-	node: INode,
-	parameterName: string,
-	itemIndex: number,
-	mode: WorkflowExecuteMode,
-	additionalKeys: IWorkflowDataProxyAdditionalKeys,
-	executeData?: IExecuteData,
-	fallbackValue?: any,
-	options?: IGetNodeParameterOptions,
-): NodeParameterValueType | object {
-	const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-	if (nodeType === undefined) {
-		throw new ApplicationError('Node type is unknown so cannot return parameter value', {
-			tags: { nodeType: node.type },
-		});
-	}
-
-	const value = get(node.parameters, parameterName, fallbackValue);
-
-	if (value === undefined) {
-		throw new ApplicationError('Could not get parameter', { extra: { parameterName } });
-	}
-
-	if (options?.rawExpressions) {
-		return value;
-	}
-
-	let returnData;
-
-	try {
-		returnData = workflow.expression.getParameterValue(
-			value,
-			runExecutionData,
-			runIndex,
-			itemIndex,
-			node.name,
-			connectionInputData,
-			mode,
-			additionalKeys,
-			executeData,
-			false,
-			{},
-			options?.contextNode?.name,
-		);
-		cleanupParameterData(returnData);
-	} catch (e) {
-		if (e instanceof ExpressionError && node.continueOnFail && node.type === 'n8n-nodes-base.set') {
-			// https://linear.app/n8n/issue/PAY-684
-			returnData = [{ name: undefined, value: undefined }];
-		} else {
-			if (e.context) e.context.parameter = parameterName;
-			e.cause = value;
-			throw e;
-		}
-	}
-
-	// This is outside the try/catch because it throws errors with proper messages
-	if (options?.extractValue) {
-		returnData = extractValue(returnData, parameterName, node, nodeType, itemIndex);
-	}
-
-	// Make sure parameter value is the type specified in the ensureType option, if needed convert it
-	if (options?.ensureType) {
-		returnData = ensureType(options.ensureType, returnData, parameterName, {
-			itemIndex,
-			runIndex,
-			nodeCause: node.name,
-		});
-	}
-
-	// Validate parameter value if it has a schema defined(RMC) or validateType defined
-	returnData = validateValueAgainstSchema(
-		node,
-		nodeType,
-		returnData,
-		parameterName,
-		runIndex,
-		itemIndex,
-	);
-
-	return returnData;
-}
-
-/**
- * Returns if execution should be continued even if there was an error.
- *
- */
-export function continueOnFail(node: INode): boolean {
-	const onError = get(node, 'onError', undefined);
-
-	if (onError === undefined) {
-		return get(node, 'continueOnFail', false);
-	}
-
-	return ['continueRegularOutput', 'continueErrorOutput'].includes(onError);
-}
-
 /**
  * Returns the webhook URL of the webhook with the given name
- *
  */
 export function getNodeWebhookUrl(
 	name: WebhookType,
@@ -2690,7 +2022,6 @@ export function getNodeWebhookUrl(
 
 /**
  * Returns the full webhook description of the webhook with the given name
- *
  */
 export function getWebhookDescription(
 	name: WebhookType,
@@ -2714,7 +2045,7 @@ export function getWebhookDescription(
 }
 
 // TODO: Change options to an object
-const addExecutionDataFunctions = async (
+export const addExecutionDataFunctions = async (
 	type: 'input' | 'output',
 	nodeName: string,
 	data: INodeExecutionData[][] | ExecutionBaseError,
@@ -2880,25 +2211,23 @@ export async function getInputConnectionData(
 				connectedNode.type,
 				connectedNode.typeVersion,
 			);
-
-			// eslint-disable-next-line @typescript-eslint/no-use-before-define
-			const context = getSupplyDataFunctions(
+			const context = new SupplyDataContext(
 				workflow,
+				connectedNode,
+				additionalData,
+				mode,
 				runExecutionData,
 				runIndex,
 				connectionInputData,
 				inputData,
-				connectedNode,
-				additionalData,
 				executeData,
-				mode,
 				closeFunctions,
 				abortSignal,
 			);
 
 			if (!nodeType.supplyData) {
 				if (nodeType.description.outputs.includes(NodeConnectionType.AiTool)) {
-					nodeType.supplyData = async function (this: IExecuteFunctions) {
+					nodeType.supplyData = async function (this: ISupplyDataFunctions) {
 						return createNodeAsTool(this, nodeType, this.getNode().parameters);
 					};
 				} else {
@@ -2974,71 +2303,6 @@ export async function getInputConnectionData(
 		: nodes.map((node) => node.response);
 }
 
-const getCommonWorkflowFunctions = (
-	workflow: Workflow,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-): Omit<FunctionsBase, 'getCredentials'> => ({
-	logger: Logger,
-	getExecutionId: () => additionalData.executionId!,
-	getNode: () => deepCopy(node),
-	getWorkflow: () => ({
-		id: workflow.id,
-		name: workflow.name,
-		active: workflow.active,
-	}),
-	getWorkflowStaticData: (type) => workflow.getStaticData(type, node),
-	getChildNodes: (nodeName: string) => {
-		const output: NodeTypeAndVersion[] = [];
-		const nodes = workflow.getChildNodes(nodeName);
-
-		for (const nodeName of nodes) {
-			const node = workflow.nodes[nodeName];
-			output.push({
-				name: node.name,
-				type: node.type,
-				typeVersion: node.typeVersion,
-			});
-		}
-		return output;
-	},
-	getParentNodes: (nodeName: string) => {
-		const output: NodeTypeAndVersion[] = [];
-		const nodes = workflow.getParentNodes(nodeName);
-
-		for (const nodeName of nodes) {
-			const node = workflow.nodes[nodeName];
-			output.push({
-				name: node.name,
-				type: node.type,
-				typeVersion: node.typeVersion,
-			});
-		}
-		return output;
-	},
-	getKnownNodeTypes: () => workflow.nodeTypes.getKnownTypes(),
-	getRestApiUrl: () => additionalData.restApiUrl,
-	getInstanceBaseUrl: () => additionalData.instanceBaseUrl,
-	getInstanceId: () => Container.get(InstanceSettings).instanceId,
-	getTimezone: () => workflow.timezone,
-	getCredentialsProperties: (type: string) =>
-		additionalData.credentialsHelper.getCredentialsProperties(type),
-	prepareOutputData: async (outputData) => [outputData],
-});
-
-const executionCancellationFunctions = (
-	abortSignal?: AbortSignal,
-): Pick<IExecuteFunctions, 'onExecutionCancellation' | 'getExecutionCancelSignal'> => ({
-	getExecutionCancelSignal: () => abortSignal,
-	onExecutionCancellation: (handler) => {
-		const fn = () => {
-			abortSignal?.removeEventListener('abort', fn);
-			handler();
-		};
-		abortSignal?.addEventListener('abort', fn);
-	},
-});
-
 export const getRequestHelperFunctions = (
 	workflow: Workflow,
 	node: INode,
@@ -3608,609 +2872,19 @@ export function getExecuteFunctions(
 	closeFunctions: CloseFunction[],
 	abortSignal?: AbortSignal,
 ): IExecuteFunctions {
-	return ((workflow, runExecutionData, connectionInputData, inputData, node) => {
-		return {
-			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			...executionCancellationFunctions(abortSignal),
-			getMode: () => mode,
-			getCredentials: async (type, itemIndex) =>
-				await getCredentials(
-					workflow,
-					node,
-					type,
-					additionalData,
-					mode,
-					executeData,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					itemIndex,
-				),
-			getExecuteData: () => executeData,
-			setMetadata: (metadata: ITaskMetadata): void => {
-				executeData.metadata = {
-					...(executeData.metadata ?? {}),
-					...metadata,
-				};
-			},
-			continueOnFail: () => {
-				return continueOnFail(node);
-			},
-			evaluateExpression(expression: string, itemIndex: number) {
-				return workflow.expression.resolveSimpleParameterValue(
-					`=${expression}`,
-					{},
-					runExecutionData,
-					runIndex,
-					itemIndex,
-					node.name,
-					connectionInputData,
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					executeData,
-				);
-			},
-			async executeWorkflow(
-				workflowInfo: IExecuteWorkflowInfo,
-				inputData?: INodeExecutionData[],
-				parentCallbackManager?: CallbackManager,
-				options?: {
-					doNotWaitToFinish?: boolean;
-					parentExecution?: RelatedExecution;
-				},
-			): Promise<ExecuteWorkflowData> {
-				return await additionalData
-					.executeWorkflow(workflowInfo, additionalData, {
-						...options,
-						parentWorkflowId: workflow.id?.toString(),
-						inputData,
-						parentWorkflowSettings: workflow.settings,
-						node,
-						parentCallbackManager,
-					})
-					.then(async (result) => {
-						const data = await Container.get(BinaryDataService).duplicateBinaryData(
-							workflow.id,
-							additionalData.executionId!,
-							result.data,
-						);
-						return { ...result, data };
-					});
-			},
-			getContext(type: ContextType): IContextObject {
-				return NodeHelpers.getContext(runExecutionData, type, node);
-			},
-
-			async getInputConnectionData(
-				inputName: NodeConnectionType,
-				itemIndex: number,
-			): Promise<unknown> {
-				return await getInputConnectionData.call(
-					this,
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					inputData,
-					additionalData,
-					executeData,
-					mode,
-					closeFunctions,
-					inputName,
-					itemIndex,
-					abortSignal,
-				);
-			},
-
-			getNodeInputs(): INodeInputConfiguration[] {
-				const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-				return NodeHelpers.getNodeInputs(workflow, node, nodeType.description).map((output) => {
-					if (typeof output === 'string') {
-						return {
-							type: output,
-						};
-					}
-					return output;
-				});
-			},
-			getNodeOutputs(): INodeOutputConfiguration[] {
-				const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-				return NodeHelpers.getNodeOutputs(workflow, node, nodeType.description).map((output) => {
-					if (typeof output === 'string') {
-						return {
-							type: output,
-						};
-					}
-					return output;
-				});
-			},
-			getInputData: (inputIndex = 0, inputName = 'main') => {
-				if (!inputData.hasOwnProperty(inputName)) {
-					// Return empty array because else it would throw error when nothing is connected to input
-					return [];
-				}
-
-				// TODO: Check if nodeType has input with that index defined
-				if (inputData[inputName].length < inputIndex) {
-					throw new ApplicationError('Could not get input with given index', {
-						extra: { inputIndex, inputName },
-					});
-				}
-
-				if (inputData[inputName][inputIndex] === null) {
-					throw new ApplicationError('Value of input was not set', {
-						extra: { inputIndex, inputName },
-					});
-				}
-
-				return inputData[inputName][inputIndex];
-			},
-			getInputSourceData: (inputIndex = 0, inputName = 'main') => {
-				if (executeData?.source === null) {
-					// Should never happen as n8n sets it automatically
-					throw new ApplicationError('Source data is missing');
-				}
-				return executeData.source[inputName][inputIndex];
-			},
-			getNodeParameter: (
-				parameterName: string,
-				itemIndex: number,
-				fallbackValue?: any,
-				options?: IGetNodeParameterOptions,
-			): NodeParameterValueType | object => {
-				return getNodeParameter(
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					node,
-					parameterName,
-					itemIndex,
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					executeData,
-					fallbackValue,
-					options,
-				);
-			},
-			getWorkflowDataProxy: (itemIndex: number): IWorkflowDataProxyData => {
-				const dataProxy = new WorkflowDataProxy(
-					workflow,
-					runExecutionData,
-					runIndex,
-					itemIndex,
-					node.name,
-					connectionInputData,
-					{},
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					executeData,
-				);
-				return dataProxy.getDataProxy();
-			},
-			async putExecutionToWait(waitTill: Date): Promise<void> {
-				runExecutionData.waitTill = waitTill;
-				if (additionalData.setExecutionStatus) {
-					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;
-				}
-				try {
-					if (additionalData.sendDataToUI) {
-						args = args.map((arg) => {
-							// prevent invalid dates from being logged as null
-							if (arg.isLuxonDateTime && arg.invalidReason) return { ...arg };
-
-							// log valid dates in human readable format, as in browser
-							if (arg.isLuxonDateTime) return new Date(arg.ts).toString();
-							if (arg instanceof Date) return arg.toString();
-
-							return arg;
-						});
-
-						additionalData.sendDataToUI('sendConsoleMessage', {
-							source: `[Node: "${node.name}"]`,
-							messages: args,
-						});
-					}
-				} catch (error) {
-					Logger.warn(`There was a problem sending message to UI: ${error.message}`);
-				}
-			},
-			async sendResponse(response: IExecuteResponsePromiseData): Promise<void> {
-				await additionalData.hooks?.executeHookFunctions('sendResponse', [response]);
-			},
-
-			addInputData(
-				connectionType: NodeConnectionType,
-				data: INodeExecutionData[][] | ExecutionBaseError,
-			): { index: number } {
-				const nodeName = this.getNode().name;
-				let currentNodeRunIndex = 0;
-				if (runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
-					currentNodeRunIndex = runExecutionData.resultData.runData[nodeName].length;
-				}
-
-				addExecutionDataFunctions(
-					'input',
-					this.getNode().name,
-					data,
-					runExecutionData,
-					connectionType,
-					additionalData,
-					node.name,
-					runIndex,
-					currentNodeRunIndex,
-				).catch((error) => {
-					Logger.warn(
-						`There was a problem logging input data of node "${this.getNode().name}": ${
-							error.message
-						}`,
-					);
-				});
-
-				return { index: currentNodeRunIndex };
-			},
-			addOutputData(
-				connectionType: NodeConnectionType,
-				currentNodeRunIndex: number,
-				data: INodeExecutionData[][] | ExecutionBaseError,
-				metadata?: ITaskMetadata,
-			): void {
-				addExecutionDataFunctions(
-					'output',
-					this.getNode().name,
-					data,
-					runExecutionData,
-					connectionType,
-					additionalData,
-					node.name,
-					runIndex,
-					currentNodeRunIndex,
-					metadata,
-				).catch((error) => {
-					Logger.warn(
-						`There was a problem logging output data of node "${this.getNode().name}": ${
-							error.message
-						}`,
-					);
-				});
-			},
-			helpers: {
-				createDeferredPromise,
-				copyInputItems,
-				...getRequestHelperFunctions(
-					workflow,
-					node,
-					additionalData,
-					runExecutionData,
-					connectionInputData,
-				),
-				...getSSHTunnelFunctions(),
-				...getFileSystemHelperFunctions(node),
-				...getBinaryHelperFunctions(additionalData, workflow.id),
-				...getCheckProcessedHelperFunctions(workflow, node),
-				assertBinaryData: (itemIndex, propertyName) =>
-					assertBinaryData(inputData, node, itemIndex, propertyName, 0),
-				getBinaryDataBuffer: async (itemIndex, propertyName) =>
-					await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
-
-				returnJsonArray,
-				normalizeItems,
-				constructExecutionMetaData,
-			},
-			nodeHelpers: getNodeHelperFunctions(additionalData, workflow.id),
-			logAiEvent: (eventName: AiEvent, msg: string) => {
-				return additionalData.logAiEvent(eventName, {
-					executionId: additionalData.executionId ?? 'unsaved-execution',
-					nodeName: node.name,
-					workflowName: workflow.name ?? 'Unnamed workflow',
-					nodeType: node.type,
-					workflowId: workflow.id ?? 'unsaved-workflow',
-					msg,
-				});
-			},
-			getParentCallbackManager: () => additionalData.parentCallbackManager,
-			startJob: createAgentStartJob(
-				additionalData,
-				inputData,
-				node,
-				workflow,
-				runExecutionData,
-				runIndex,
-				node.name,
-				connectionInputData,
-				{},
-				mode,
-				executeData,
-			),
-		};
-	})(workflow, runExecutionData, connectionInputData, inputData, node) as IExecuteFunctions;
-}
-
-export function getSupplyDataFunctions(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	connectionInputData: INodeExecutionData[],
-	inputData: ITaskDataConnections,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	executeData: IExecuteData,
-	mode: WorkflowExecuteMode,
-	closeFunctions: CloseFunction[],
-	abortSignal?: AbortSignal,
-): ISupplyDataFunctions {
-	return {
-		...getCommonWorkflowFunctions(workflow, node, additionalData),
-		...executionCancellationFunctions(abortSignal),
-		getMode: () => mode,
-		getCredentials: async (type, itemIndex) =>
-			await getCredentials(
-				workflow,
-				node,
-				type,
-				additionalData,
-				mode,
-				executeData,
-				runExecutionData,
-				runIndex,
-				connectionInputData,
-				itemIndex,
-			),
-		continueOnFail: () => continueOnFail(node),
-		evaluateExpression: (expression: string, itemIndex: number) =>
-			workflow.expression.resolveSimpleParameterValue(
-				`=${expression}`,
-				{},
-				runExecutionData,
-				runIndex,
-				itemIndex,
-				node.name,
-				connectionInputData,
-				mode,
-				getAdditionalKeys(additionalData, mode, runExecutionData),
-				executeData,
-			),
-		executeWorkflow: async (
-			workflowInfo: IExecuteWorkflowInfo,
-			inputData?: INodeExecutionData[],
-			parentCallbackManager?: CallbackManager,
-			options?: {
-				doNotWaitToFinish?: boolean;
-				parentExecution?: RelatedExecution;
-			},
-		): Promise<ExecuteWorkflowData> =>
-			await additionalData
-				.executeWorkflow(workflowInfo, additionalData, {
-					parentWorkflowId: workflow.id?.toString(),
-					inputData,
-					parentWorkflowSettings: workflow.settings,
-					node,
-					parentCallbackManager,
-					...options,
-				})
-				.then(async (result) => {
-					const data = await Container.get(BinaryDataService).duplicateBinaryData(
-						workflow.id,
-						additionalData.executionId!,
-						result.data,
-					);
-					return { ...result, data };
-				}),
-		getNodeOutputs() {
-			const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-			return NodeHelpers.getNodeOutputs(workflow, node, nodeType.description).map((output) => {
-				if (typeof output === 'string') {
-					return {
-						type: output,
-					};
-				}
-				return output;
-			});
-		},
-		async getInputConnectionData(
-			inputName: NodeConnectionType,
-			itemIndex: number,
-		): Promise<unknown> {
-			return await getInputConnectionData.call(
-				this,
-				workflow,
-				runExecutionData,
-				runIndex,
-				connectionInputData,
-				inputData,
-				additionalData,
-				executeData,
-				mode,
-				closeFunctions,
-				inputName,
-				itemIndex,
-				abortSignal,
-			);
-		},
-		getInputData: (inputIndex = 0, inputName = 'main') => {
-			if (!inputData.hasOwnProperty(inputName)) {
-				// Return empty array because else it would throw error when nothing is connected to input
-				return [];
-			}
-
-			// TODO: Check if nodeType has input with that index defined
-			if (inputData[inputName].length < inputIndex) {
-				throw new ApplicationError('Could not get input with given index', {
-					extra: { inputIndex, inputName },
-				});
-			}
-
-			if (inputData[inputName][inputIndex] === null) {
-				throw new ApplicationError('Value of input was not set', {
-					extra: { inputIndex, inputName },
-				});
-			}
-
-			return inputData[inputName][inputIndex];
-		},
-		getNodeParameter: ((
-			parameterName: string,
-			itemIndex: number,
-			fallbackValue?: any,
-			options?: IGetNodeParameterOptions,
-		) =>
-			getNodeParameter(
-				workflow,
-				runExecutionData,
-				runIndex,
-				connectionInputData,
-				node,
-				parameterName,
-				itemIndex,
-				mode,
-				getAdditionalKeys(additionalData, mode, runExecutionData),
-				executeData,
-				fallbackValue,
-				options,
-			)) as ISupplyDataFunctions['getNodeParameter'],
-		getWorkflowDataProxy: (itemIndex: number) =>
-			new WorkflowDataProxy(
-				workflow,
-				runExecutionData,
-				runIndex,
-				itemIndex,
-				node.name,
-				connectionInputData,
-				{},
-				mode,
-				getAdditionalKeys(additionalData, mode, runExecutionData),
-				executeData,
-			).getDataProxy(),
-		sendMessageToUI(...args: any[]): void {
-			if (mode !== 'manual') {
-				return;
-			}
-			try {
-				if (additionalData.sendDataToUI) {
-					args = args.map((arg) => {
-						// prevent invalid dates from being logged as null
-						if (arg.isLuxonDateTime && arg.invalidReason) return { ...arg };
-
-						// log valid dates in human readable format, as in browser
-						if (arg.isLuxonDateTime) return new Date(arg.ts).toString();
-						if (arg instanceof Date) return arg.toString();
-
-						return arg;
-					});
-
-					additionalData.sendDataToUI('sendConsoleMessage', {
-						source: `[Node: "${node.name}"]`,
-						messages: args,
-					});
-				}
-			} catch (error) {
-				Logger.warn(`There was a problem sending message to UI: ${error.message}`);
-			}
-		},
-		logAiEvent: (eventName: AiEvent, msg: string) =>
-			additionalData.logAiEvent(eventName, {
-				executionId: additionalData.executionId ?? 'unsaved-execution',
-				nodeName: node.name,
-				workflowName: workflow.name ?? 'Unnamed workflow',
-				nodeType: node.type,
-				workflowId: workflow.id ?? 'unsaved-workflow',
-				msg,
-			}),
-		addInputData(
-			connectionType: NodeConnectionType,
-			data: INodeExecutionData[][],
-		): { index: number } {
-			const nodeName = this.getNode().name;
-			let currentNodeRunIndex = 0;
-			if (runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
-				currentNodeRunIndex = runExecutionData.resultData.runData[nodeName].length;
-			}
-
-			addExecutionDataFunctions(
-				'input',
-				this.getNode().name,
-				data,
-				runExecutionData,
-				connectionType,
-				additionalData,
-				node.name,
-				runIndex,
-				currentNodeRunIndex,
-			).catch((error) => {
-				Logger.warn(
-					`There was a problem logging input data of node "${this.getNode().name}": ${
-						error.message
-					}`,
-				);
-			});
-
-			return { index: currentNodeRunIndex };
-		},
-		addOutputData(
-			connectionType: NodeConnectionType,
-			currentNodeRunIndex: number,
-			data: INodeExecutionData[][],
-			metadata?: ITaskMetadata,
-		): void {
-			addExecutionDataFunctions(
-				'output',
-				this.getNode().name,
-				data,
-				runExecutionData,
-				connectionType,
-				additionalData,
-				node.name,
-				runIndex,
-				currentNodeRunIndex,
-				metadata,
-			).catch((error) => {
-				Logger.warn(
-					`There was a problem logging output data of node "${this.getNode().name}": ${
-						error.message
-					}`,
-				);
-			});
-		},
-		helpers: {
-			createDeferredPromise,
-			copyInputItems,
-			...getRequestHelperFunctions(
-				workflow,
-				node,
-				additionalData,
-				runExecutionData,
-				connectionInputData,
-			),
-			...getSSHTunnelFunctions(),
-			...getFileSystemHelperFunctions(node),
-			...getBinaryHelperFunctions(additionalData, workflow.id),
-			...getCheckProcessedHelperFunctions(workflow, node),
-			assertBinaryData: (itemIndex, propertyName) =>
-				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
-			getBinaryDataBuffer: async (itemIndex, propertyName) =>
-				await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
-
-			returnJsonArray,
-			normalizeItems,
-			constructExecutionMetaData,
-		},
-	};
+	return new ExecuteContext(
+		workflow,
+		node,
+		additionalData,
+		mode,
+		runExecutionData,
+		runIndex,
+		connectionInputData,
+		inputData,
+		executeData,
+		closeFunctions,
+		abortSignal,
+	);
 }
 
 /**
diff --git a/packages/core/src/PartialExecutionUtils/DirectedGraph.ts b/packages/core/src/PartialExecutionUtils/DirectedGraph.ts
index 6f8b43a660..481a73392d 100644
--- a/packages/core/src/PartialExecutionUtils/DirectedGraph.ts
+++ b/packages/core/src/PartialExecutionUtils/DirectedGraph.ts
@@ -470,6 +470,12 @@ export class DirectedGraph {
 		return graph;
 	}
 
+	clone() {
+		return new DirectedGraph()
+			.addNodes(...this.getNodes().values())
+			.addConnections(...this.getConnections().values());
+	}
+
 	private toIConnections() {
 		const result: IConnections = {};
 
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/filterDisabledNodes.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/filterDisabledNodes.test.ts
new file mode 100644
index 0000000000..7e60e009a8
--- /dev/null
+++ b/packages/core/src/PartialExecutionUtils/__tests__/filterDisabledNodes.test.ts
@@ -0,0 +1,124 @@
+// NOTE: Diagrams in this file have been created with https://asciiflow.com/#/
+// If you update the tests, please update the diagrams as well.
+// If you add a test, please create a new diagram.
+//
+// Map
+// 0  means the output has no run data
+// 1  means the output has run data
+// ►► denotes the node that the user wants to execute to
+// 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 { filterDisabledNodes } from '../filterDisabledNodes';
+
+describe('filterDisabledNodes', () => {
+	//                     XX
+	//  ┌───────┐         ┌────────┐       ►►
+	//  │       ├────────►│        │      ┌───────────┐
+	//  │trigger│         │disabled├─────►│destination│
+	//  │       ├────────►│        │      └───────────┘
+	//  └───────┘         └────────┘
+	// turns into
+	//  ┌───────┐       ►►
+	//  │       │      ┌───────────┐
+	//  │trigger├─────►│destination│
+	//  │       │      └───────────┘
+	//  └───────┘
+	test('filter disabled nodes', () => {
+		const trigger = createNodeData({ name: 'trigger' });
+		const disabled = createNodeData({ name: 'disabled', disabled: true });
+		const destination = createNodeData({ name: 'destination' });
+
+		const graph = new DirectedGraph()
+			.addNodes(trigger, disabled, destination)
+			.addConnections({ from: trigger, to: disabled }, { from: disabled, to: destination });
+
+		const subgraph = filterDisabledNodes(graph);
+
+		expect(subgraph).toEqual(
+			new DirectedGraph()
+				.addNodes(trigger, destination)
+				.addConnections({ from: trigger, to: destination }),
+		);
+	});
+
+	//                 XX          XX
+	//  ┌───────┐     ┌─────┐     ┌─────┐     ┌───────────┐
+	//  │trigger├────►│node1├────►│node2├────►│destination│
+	//  └───────┘     └─────┘     └─────┘     └───────────┘
+	// turns into
+	//  ┌───────┐     ┌───────────┐
+	//  │trigger├────►│destination│
+	//  └───────┘     └───────────┘
+	test('filter multiple disabled nodes in a row', () => {
+		// 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 = filterDisabledNodes(graph);
+
+		// ASSERT
+		expect(subgraph).toEqual(
+			new DirectedGraph()
+				.addNodes(trigger, destination)
+				.addConnections({ from: trigger, to: destination }),
+		);
+	});
+
+	describe('root nodes', () => {
+		//              XX
+		//  ┌───────┐   ┌────┐   ┌───────────┐
+		//  │trigger├───►root├───►destination│
+		//  └───────┘   └──▲─┘   └───────────┘
+		//                 │AiLanguageModel
+		//                ┌┴──────┐
+		//                │aiModel│
+		//                └───────┘
+		// turns into
+		//  ┌───────┐            ┌───────────┐
+		//  │trigger├────────────►destination│
+		//  └───────┘            └───────────┘
+		test('filter 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 = filterDisabledNodes(graph);
+
+			// ASSERT
+			expect(subgraph).toEqual(
+				new DirectedGraph()
+					// The model is still in the graph, but orphaned. This is ok for
+					// partial executions as findSubgraph will remove orphaned nodes.
+					.addNodes(trigger, destination, aiModel)
+					.addConnections({ from: trigger, to: destination }),
+			);
+		});
+	});
+});
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
index ab33ccf8ed..8dee8dff1b 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
@@ -46,7 +46,13 @@ describe('findStartNodes', () => {
 		const node = createNodeData({ name: 'Basic Node' });
 		const graph = new DirectedGraph().addNode(node);
 
-		const startNodes = findStartNodes({ graph, trigger: node, destination: node });
+		const startNodes = findStartNodes({
+			graph,
+			trigger: node,
+			destination: node,
+			pinData: {},
+			runData: {},
+		});
 
 		expect(startNodes.size).toBe(1);
 		expect(startNodes).toContainEqual(node);
@@ -65,7 +71,13 @@ describe('findStartNodes', () => {
 
 		// if the trigger has no run data
 		{
-			const startNodes = findStartNodes({ graph, trigger, destination });
+			const startNodes = findStartNodes({
+				graph,
+				trigger,
+				destination,
+				pinData: {},
+				runData: {},
+			});
 
 			expect(startNodes.size).toBe(1);
 			expect(startNodes).toContainEqual(trigger);
@@ -77,7 +89,13 @@ describe('findStartNodes', () => {
 				[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
 			};
 
-			const startNodes = findStartNodes({ graph, trigger, destination, runData });
+			const startNodes = findStartNodes({
+				graph,
+				trigger,
+				destination,
+				runData,
+				pinData: {},
+			});
 
 			expect(startNodes.size).toBe(1);
 			expect(startNodes).toContainEqual(destination);
@@ -112,7 +130,13 @@ describe('findStartNodes', () => {
 		};
 
 		// ACT
-		const startNodes = findStartNodes({ graph, trigger, destination: node, runData });
+		const startNodes = findStartNodes({
+			graph,
+			trigger,
+			destination: node,
+			runData,
+			pinData: {},
+		});
 
 		// ASSERT
 		expect(startNodes.size).toBe(1);
@@ -153,7 +177,13 @@ describe('findStartNodes', () => {
 
 		{
 			// ACT
-			const startNodes = findStartNodes({ graph, trigger, destination: node4 });
+			const startNodes = findStartNodes({
+				graph,
+				trigger,
+				destination: node4,
+				pinData: {},
+				runData: {},
+			});
 
 			// ASSERT
 			expect(startNodes.size).toBe(1);
@@ -172,7 +202,13 @@ describe('findStartNodes', () => {
 			};
 
 			// ACT
-			const startNodes = findStartNodes({ graph, trigger, destination: node4, runData });
+			const startNodes = findStartNodes({
+				graph,
+				trigger,
+				destination: node4,
+				runData,
+				pinData: {},
+			});
 
 			// ASSERT
 			expect(startNodes.size).toBe(1);
@@ -208,6 +244,7 @@ describe('findStartNodes', () => {
 			runData: {
 				[trigger.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
 			},
+			pinData: {},
 		});
 
 		// ASSERT
@@ -243,6 +280,7 @@ describe('findStartNodes', () => {
 			runData: {
 				[trigger.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 1 }])],
 			},
+			pinData: {},
 		});
 
 		// ASSERT
@@ -283,6 +321,7 @@ describe('findStartNodes', () => {
 					]),
 				],
 			},
+			pinData: {},
 		});
 
 		// ASSERT
@@ -321,6 +360,7 @@ describe('findStartNodes', () => {
 				[node1.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
 				[node2.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 0 }])],
 			},
+			pinData: {},
 		});
 
 		// ASSERT
@@ -357,6 +397,7 @@ describe('findStartNodes', () => {
 				[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
 				[node1.name]: [toITaskData([{ data: { value: 1 }, outputIndex: 1 }])],
 			},
+			pinData: {},
 		});
 
 		// ASSERT
@@ -389,7 +430,13 @@ describe('findStartNodes', () => {
 		const pinData: IPinData = {};
 
 		// ACT
-		const startNodes = findStartNodes({ graph, trigger, destination: node2, runData, pinData });
+		const startNodes = findStartNodes({
+			graph,
+			trigger,
+			destination: node2,
+			runData,
+			pinData,
+		});
 
 		// ASSERT
 		expect(startNodes.size).toBe(1);
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
index fceb22da06..e479214e10 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
@@ -79,70 +79,6 @@ describe('findSubgraph', () => {
 		);
 	});
 
-	//                     XX
-	//  ┌───────┐         ┌────────┐       ►►
-	//  │       ├────────►│        │      ┌───────────┐
-	//  │trigger│         │disabled├─────►│destination│
-	//  │       ├────────►│        │      └───────────┘
-	//  └───────┘         └────────┘
-	// turns into
-	//  ┌───────┐       ►►
-	//  │       │      ┌───────────┐
-	//  │trigger├─────►│destination│
-	//  │       │      └───────────┘
-	//  └───────┘
-	test('skip disabled nodes', () => {
-		const trigger = createNodeData({ name: 'trigger' });
-		const disabled = createNodeData({ name: 'disabled', disabled: true });
-		const destination = createNodeData({ name: 'destination' });
-
-		const graph = new DirectedGraph()
-			.addNodes(trigger, disabled, destination)
-			.addConnections({ from: trigger, to: disabled }, { from: disabled, to: destination });
-
-		const subgraph = findSubgraph({ graph, destination, trigger });
-
-		expect(subgraph).toEqual(
-			new DirectedGraph()
-				.addNodes(trigger, destination)
-				.addConnections({ from: trigger, to: destination }),
-		);
-	});
-
-	//                 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│
@@ -291,36 +227,29 @@ describe('findSubgraph', () => {
 			expect(subgraph.getNodes().size).toBe(0);
 		});
 
+		//  ┌───────┐            ┌───────────┐
+		//  │trigger├────────────►destination│
+		//  └───────┘            └───────────┘
 		//
-		//              XX
-		//  ┌───────┐   ┌────┐   ┌───────────┐
-		//  │trigger├───►root├───►destination│
-		//  └───────┘   └──▲─┘   └───────────┘
-		//                 │AiLanguageModel
-		//                ┌┴──────┐
+		//                ┌───────┐
 		//                │aiModel│
 		//                └───────┘
 		// turns into
 		//  ┌───────┐            ┌───────────┐
 		//  │trigger├────────────►destination│
 		//  └───────┘            └───────────┘
-		test('skip disabled root nodes', () => {
+		test('remove orphaned 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 },
-				);
+				.addNodes(trigger, aiModel, destination)
+				.addConnections({ from: trigger, to: destination });
 
 			// ACT
-			const subgraph = findSubgraph({ graph, destination: root, trigger });
+			const subgraph = findSubgraph({ graph, destination, trigger });
 
 			// ASSERT
 			expect(subgraph).toEqual(
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/helpers.ts b/packages/core/src/PartialExecutionUtils/__tests__/helpers.ts
index 72b1efa30c..6a6c8a88db 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/helpers.ts
+++ b/packages/core/src/PartialExecutionUtils/__tests__/helpers.ts
@@ -5,13 +5,14 @@ interface StubNode {
 	name: string;
 	parameters?: INodeParameters;
 	disabled?: boolean;
+	type?: string;
 }
 
 export function createNodeData(stubData: StubNode): INode {
 	return {
 		name: stubData.name,
 		parameters: stubData.parameters ?? {},
-		type: 'test.set',
+		type: stubData.type ?? 'n8n-nodes-base.set',
 		typeVersion: 1,
 		id: 'uuid-1234',
 		position: [100, 100],
diff --git a/packages/core/src/PartialExecutionUtils/filterDisabledNodes.ts b/packages/core/src/PartialExecutionUtils/filterDisabledNodes.ts
new file mode 100644
index 0000000000..c381f70759
--- /dev/null
+++ b/packages/core/src/PartialExecutionUtils/filterDisabledNodes.ts
@@ -0,0 +1,18 @@
+import { NodeConnectionType } from 'n8n-workflow';
+
+import type { DirectedGraph } from './DirectedGraph';
+
+export function filterDisabledNodes(graph: DirectedGraph): DirectedGraph {
+	const filteredGraph = graph.clone();
+
+	for (const node of filteredGraph.getNodes().values()) {
+		if (node.disabled) {
+			filteredGraph.removeNode(node, {
+				reconnectConnections: true,
+				skipConnectionFn: (c) => c.type !== NodeConnectionType.Main,
+			});
+		}
+	}
+
+	return filteredGraph;
+}
diff --git a/packages/core/src/PartialExecutionUtils/findStartNodes.ts b/packages/core/src/PartialExecutionUtils/findStartNodes.ts
index 5eb036bd88..b3f4f95399 100644
--- a/packages/core/src/PartialExecutionUtils/findStartNodes.ts
+++ b/packages/core/src/PartialExecutionUtils/findStartNodes.ts
@@ -135,14 +135,14 @@ export function findStartNodes(options: {
 	graph: DirectedGraph;
 	trigger: INode;
 	destination: INode;
-	runData?: IRunData;
-	pinData?: IPinData;
+	pinData: IPinData;
+	runData: IRunData;
 }): Set<INode> {
 	const graph = options.graph;
 	const trigger = options.trigger;
 	const destination = options.destination;
-	const runData = options.runData ?? {};
-	const pinData = options.pinData ?? {};
+	const runData = { ...options.runData };
+	const pinData = options.pinData;
 
 	const startNodes = findStartNodesRecursive(
 		graph,
diff --git a/packages/core/src/PartialExecutionUtils/findSubgraph.ts b/packages/core/src/PartialExecutionUtils/findSubgraph.ts
index 4d3bc4cc3f..039124c1ad 100644
--- a/packages/core/src/PartialExecutionUtils/findSubgraph.ts
+++ b/packages/core/src/PartialExecutionUtils/findSubgraph.ts
@@ -21,7 +21,7 @@ function findSubgraphRecursive(
 		return;
 	}
 
-	let parentConnections = graph.getDirectParentConnections(current);
+	const parentConnections = graph.getDirectParentConnections(current);
 
 	// If the current node has no parents, don’t keep this branch.
 	if (parentConnections.length === 0) {
@@ -46,27 +46,6 @@ function findSubgraphRecursive(
 		return;
 	}
 
-	// If the current node is disabled, don’t keep this node, but keep the
-	// branch.
-	// Take every incoming connection and connect it to every node that is
-	// connected to the current node’s first output
-	if (current.disabled) {
-		// The last segment on the current branch is still pointing to the removed
-		// node, so let's remove it.
-		currentBranch.pop();
-
-		// 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
@@ -84,8 +63,7 @@ function findSubgraphRecursive(
 }
 
 /**
- * Find all nodes that can lead from the trigger to the destination node,
- * ignoring disabled nodes.
+ * Find all nodes that can lead from the trigger to the destination node.
  *
  * The algorithm is:
  *   Start with Destination Node
@@ -95,12 +73,8 @@ function findSubgraphRecursive(
  *   3. if the current node is the destination node again, don’t keep this
  *      branch
  *   4. if the current node was already visited, keep this branch
- *   5. if the current node is disabled, don’t keep this node, but keep the
- *      branch
- *     - 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.
+ *   5. Recurse on each parent
+ *   6. 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.
diff --git a/packages/core/src/PartialExecutionUtils/index.ts b/packages/core/src/PartialExecutionUtils/index.ts
index cea8ded9b9..f85202cfa1 100644
--- a/packages/core/src/PartialExecutionUtils/index.ts
+++ b/packages/core/src/PartialExecutionUtils/index.ts
@@ -5,3 +5,4 @@ export { findSubgraph } from './findSubgraph';
 export { recreateNodeExecutionStack } from './recreateNodeExecutionStack';
 export { cleanRunData } from './cleanRunData';
 export { handleCycles } from './handleCycles';
+export { filterDisabledNodes } from './filterDisabledNodes';
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index c6e0316038..5e1fecdfac 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -4,6 +4,7 @@
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 import * as assert from 'assert/strict';
 import { setMaxListeners } from 'events';
+import { omit } from 'lodash';
 import get from 'lodash/get';
 import type {
 	ExecutionBaseError,
@@ -58,6 +59,7 @@ import {
 	cleanRunData,
 	recreateNodeExecutionStack,
 	handleCycles,
+	filterDisabledNodes,
 } from './PartialExecutionUtils';
 
 export class WorkflowExecute {
@@ -319,8 +321,9 @@ export class WorkflowExecute {
 	runPartialWorkflow2(
 		workflow: Workflow,
 		runData: IRunData,
+		pinData: IPinData = {},
+		dirtyNodeNames: string[] = [],
 		destinationNodeName?: string,
-		pinData?: IPinData,
 	): PCancelable<IRun> {
 		// TODO: Refactor the call-site to make `destinationNodeName` a required
 		// after removing the old partial execution flow.
@@ -345,11 +348,12 @@ export class WorkflowExecute {
 
 		// 2. Find the Subgraph
 		const graph = DirectedGraph.fromWorkflow(workflow);
-		const subgraph = findSubgraph({ graph, destination, trigger });
+		const subgraph = findSubgraph({ graph: filterDisabledNodes(graph), destination, trigger });
 		const filteredNodes = subgraph.getNodes();
 
 		// 3. Find the Start Nodes
-		let startNodes = findStartNodes({ graph: subgraph, trigger, destination, runData });
+		runData = omit(runData, dirtyNodeNames);
+		let startNodes = findStartNodes({ graph: subgraph, trigger, destination, runData, pinData });
 
 		// 4. Detect Cycles
 		// 5. Handle Cycles
@@ -948,7 +952,7 @@ export class WorkflowExecute {
 			const returnPromise = (async () => {
 				try {
 					if (!this.additionalData.restartExecutionId) {
-						await this.executeHook('workflowExecuteBefore', [workflow]);
+						await this.executeHook('workflowExecuteBefore', [workflow, this.runExecutionData]);
 					}
 				} catch (error) {
 					const e = error as unknown as ExecutionBaseError;
diff --git a/packages/core/src/node-execution-context/__tests__/execute-context.test.ts b/packages/core/src/node-execution-context/__tests__/execute-context.test.ts
new file mode 100644
index 0000000000..723bab24f3
--- /dev/null
+++ b/packages/core/src/node-execution-context/__tests__/execute-context.test.ts
@@ -0,0 +1,212 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	INode,
+	IWorkflowExecuteAdditionalData,
+	IRunExecutionData,
+	INodeExecutionData,
+	ITaskDataConnections,
+	IExecuteData,
+	Workflow,
+	WorkflowExecuteMode,
+	ICredentialsHelper,
+	Expression,
+	INodeType,
+	INodeTypes,
+	ICredentialDataDecryptedObject,
+} from 'n8n-workflow';
+import { ApplicationError, ExpressionError } from 'n8n-workflow';
+
+import { describeCommonTests } from './shared-tests';
+import { ExecuteContext } from '../execute-context';
+
+describe('ExecuteContext', () => {
+	const testCredentialType = 'testCredential';
+	const nodeType = mock<INodeType>({
+		description: {
+			credentials: [
+				{
+					name: testCredentialType,
+					required: true,
+				},
+			],
+			properties: [
+				{
+					name: 'testParameter',
+					required: true,
+				},
+			],
+		},
+	});
+	const nodeTypes = mock<INodeTypes>();
+	const expression = mock<Expression>();
+	const workflow = mock<Workflow>({ expression, nodeTypes });
+	const node = mock<INode>({
+		name: 'Test Node',
+		credentials: {
+			[testCredentialType]: {
+				id: 'testCredentialId',
+			},
+		},
+	});
+	node.parameters = {
+		testParameter: 'testValue',
+		nullParameter: null,
+	};
+	const credentialsHelper = mock<ICredentialsHelper>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ credentialsHelper });
+	const mode: WorkflowExecuteMode = 'manual';
+	const runExecutionData = mock<IRunExecutionData>();
+	const connectionInputData: INodeExecutionData[] = [];
+	const inputData: ITaskDataConnections = { main: [[{ json: { test: 'data' } }]] };
+	const executeData = mock<IExecuteData>();
+	const runIndex = 0;
+	const closeFn = jest.fn();
+	const abortSignal = mock<AbortSignal>();
+
+	const executeContext = new ExecuteContext(
+		workflow,
+		node,
+		additionalData,
+		mode,
+		runExecutionData,
+		runIndex,
+		connectionInputData,
+		inputData,
+		executeData,
+		[closeFn],
+		abortSignal,
+	);
+
+	beforeEach(() => {
+		nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+		expression.getParameterValue.mockImplementation((value) => value);
+	});
+
+	describeCommonTests(executeContext, {
+		abortSignal,
+		node,
+		workflow,
+		executeData,
+		runExecutionData,
+	});
+
+	describe('getInputData', () => {
+		const inputIndex = 0;
+		const inputName = 'main';
+
+		afterEach(() => {
+			inputData[inputName] = [[{ json: { test: 'data' } }]];
+		});
+
+		it('should return the input data correctly', () => {
+			const expectedData = [{ json: { test: 'data' } }];
+
+			expect(executeContext.getInputData(inputIndex, inputName)).toEqual(expectedData);
+		});
+
+		it('should return an empty array if the input name does not exist', () => {
+			const inputName = 'nonExistent';
+			expect(executeContext.getInputData(inputIndex, inputName)).toEqual([]);
+		});
+
+		it('should throw an error if the input index is out of range', () => {
+			const inputIndex = 2;
+
+			expect(() => executeContext.getInputData(inputIndex, inputName)).toThrow(ApplicationError);
+		});
+
+		it('should throw an error if the input index was not set', () => {
+			inputData.main[inputIndex] = null;
+
+			expect(() => executeContext.getInputData(inputIndex, inputName)).toThrow(ApplicationError);
+		});
+	});
+
+	describe('getNodeParameter', () => {
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			expression.getParameterValue.mockImplementation((value) => value);
+		});
+
+		it('should throw if parameter is not defined on the node.parameters', () => {
+			expect(() => executeContext.getNodeParameter('invalidParameter', 0)).toThrow(
+				'Could not get parameter',
+			);
+		});
+
+		it('should return null if the parameter exists but has a null value', () => {
+			const parameter = executeContext.getNodeParameter('nullParameter', 0);
+
+			expect(parameter).toBeNull();
+		});
+
+		it('should return parameter value when it exists', () => {
+			const parameter = executeContext.getNodeParameter('testParameter', 0);
+
+			expect(parameter).toBe('testValue');
+		});
+
+		it('should return the fallback value when the parameter does not exist', () => {
+			const parameter = executeContext.getNodeParameter('otherParameter', 0, 'fallback');
+
+			expect(parameter).toBe('fallback');
+		});
+
+		it('should handle expression evaluation errors', () => {
+			const error = new ExpressionError('Invalid expression');
+			expression.getParameterValue.mockImplementationOnce(() => {
+				throw error;
+			});
+
+			expect(() => executeContext.getNodeParameter('testParameter', 0)).toThrow(error);
+			expect(error.context.parameter).toEqual('testParameter');
+		});
+
+		it('should handle expression errors on Set nodes (Ticket #PAY-684)', () => {
+			node.type = 'n8n-nodes-base.set';
+			node.continueOnFail = true;
+
+			expression.getParameterValue.mockImplementationOnce(() => {
+				throw new ExpressionError('Invalid expression');
+			});
+
+			const parameter = executeContext.getNodeParameter('testParameter', 0);
+			expect(parameter).toEqual([{ name: undefined, value: undefined }]);
+		});
+	});
+
+	describe('getCredentials', () => {
+		it('should get decrypted credentials', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			credentialsHelper.getDecrypted.mockResolvedValue({ secret: 'token' });
+
+			const credentials = await executeContext.getCredentials<ICredentialDataDecryptedObject>(
+				testCredentialType,
+				0,
+			);
+
+			expect(credentials).toEqual({ secret: 'token' });
+		});
+	});
+
+	describe('getExecuteData', () => {
+		it('should return the execute data correctly', () => {
+			expect(executeContext.getExecuteData()).toEqual(executeData);
+		});
+	});
+
+	describe('getWorkflowDataProxy', () => {
+		it('should return the workflow data proxy correctly', () => {
+			const workflowDataProxy = executeContext.getWorkflowDataProxy(0);
+			expect(workflowDataProxy.isProxy).toBe(true);
+			expect(Object.keys(workflowDataProxy.$input)).toEqual([
+				'all',
+				'context',
+				'first',
+				'item',
+				'last',
+				'params',
+			]);
+		});
+	});
+});
diff --git a/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts b/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts
index 8a2fc72be3..e62c2b0f46 100644
--- a/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts
+++ b/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts
@@ -12,15 +12,11 @@ import type {
 	Expression,
 	INodeType,
 	INodeTypes,
-	OnError,
-	ContextType,
-	IContextObject,
 	ICredentialDataDecryptedObject,
-	ISourceData,
-	ITaskMetadata,
 } from 'n8n-workflow';
-import { ApplicationError, NodeHelpers } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
 
+import { describeCommonTests } from './shared-tests';
 import { ExecuteSingleContext } from '../execute-single-context';
 
 describe('ExecuteSingleContext', () => {
@@ -45,6 +41,7 @@ describe('ExecuteSingleContext', () => {
 	const expression = mock<Expression>();
 	const workflow = mock<Workflow>({ expression, nodeTypes });
 	const node = mock<INode>({
+		name: 'Test Node',
 		credentials: {
 			[testCredentialType]: {
 				id: 'testCredentialId',
@@ -58,7 +55,7 @@ describe('ExecuteSingleContext', () => {
 	const additionalData = mock<IWorkflowExecuteAdditionalData>({ credentialsHelper });
 	const mode: WorkflowExecuteMode = 'manual';
 	const runExecutionData = mock<IRunExecutionData>();
-	const connectionInputData = mock<INodeExecutionData[]>();
+	const connectionInputData: INodeExecutionData[] = [];
 	const inputData: ITaskDataConnections = { main: [[{ json: { test: 'data' } }]] };
 	const executeData = mock<IExecuteData>();
 	const runIndex = 0;
@@ -84,81 +81,12 @@ describe('ExecuteSingleContext', () => {
 		expression.getParameterValue.mockImplementation((value) => value);
 	});
 
-	describe('getExecutionCancelSignal', () => {
-		it('should return the abort signal', () => {
-			expect(executeSingleContext.getExecutionCancelSignal()).toBe(abortSignal);
-		});
-	});
-
-	describe('continueOnFail', () => {
-		afterEach(() => {
-			node.onError = undefined;
-			node.continueOnFail = false;
-		});
-
-		it('should return false for nodes by default', () => {
-			expect(executeSingleContext.continueOnFail()).toEqual(false);
-		});
-
-		it('should return true if node has continueOnFail set to true', () => {
-			node.continueOnFail = true;
-			expect(executeSingleContext.continueOnFail()).toEqual(true);
-		});
-
-		test.each([
-			['continueRegularOutput', true],
-			['continueErrorOutput', true],
-			['stopWorkflow', false],
-		])('if node has onError set to %s, it should return %s', (onError, expected) => {
-			node.onError = onError as OnError;
-			expect(executeSingleContext.continueOnFail()).toEqual(expected);
-		});
-	});
-
-	describe('evaluateExpression', () => {
-		it('should evaluate the expression correctly', () => {
-			const expression = '$json.test';
-			const expectedResult = 'data';
-			const resolveSimpleParameterValueSpy = jest.spyOn(
-				workflow.expression,
-				'resolveSimpleParameterValue',
-			);
-			resolveSimpleParameterValueSpy.mockReturnValue(expectedResult);
-
-			expect(executeSingleContext.evaluateExpression(expression, itemIndex)).toEqual(
-				expectedResult,
-			);
-
-			expect(resolveSimpleParameterValueSpy).toHaveBeenCalledWith(
-				`=${expression}`,
-				{},
-				runExecutionData,
-				runIndex,
-				itemIndex,
-				node.name,
-				connectionInputData,
-				mode,
-				expect.objectContaining({}),
-				executeData,
-			);
-
-			resolveSimpleParameterValueSpy.mockRestore();
-		});
-	});
-
-	describe('getContext', () => {
-		it('should return the context object', () => {
-			const contextType: ContextType = 'node';
-			const expectedContext = mock<IContextObject>();
-			const getContextSpy = jest.spyOn(NodeHelpers, 'getContext');
-			getContextSpy.mockReturnValue(expectedContext);
-
-			expect(executeSingleContext.getContext(contextType)).toEqual(expectedContext);
-
-			expect(getContextSpy).toHaveBeenCalledWith(runExecutionData, contextType, node);
-
-			getContextSpy.mockRestore();
-		});
+	describeCommonTests(executeSingleContext, {
+		abortSignal,
+		node,
+		workflow,
+		executeData,
+		runExecutionData,
 	});
 
 	describe('getInputData', () => {
@@ -266,66 +194,4 @@ describe('ExecuteSingleContext', () => {
 			]);
 		});
 	});
-
-	describe('getInputSourceData', () => {
-		it('should return the input source data correctly', () => {
-			const inputSourceData = mock<ISourceData>();
-			executeData.source = { main: [inputSourceData] };
-
-			expect(executeSingleContext.getInputSourceData()).toEqual(inputSourceData);
-		});
-
-		it('should throw an error if the source data is missing', () => {
-			executeData.source = null;
-
-			expect(() => executeSingleContext.getInputSourceData()).toThrow(ApplicationError);
-		});
-	});
-
-	describe('logAiEvent', () => {
-		it('should log the AI event correctly', () => {
-			const eventName = 'ai-tool-called';
-			const msg = 'test message';
-
-			executeSingleContext.logAiEvent(eventName, msg);
-
-			expect(additionalData.logAiEvent).toHaveBeenCalledWith(eventName, {
-				executionId: additionalData.executionId,
-				nodeName: node.name,
-				workflowName: workflow.name,
-				nodeType: node.type,
-				workflowId: workflow.id,
-				msg,
-			});
-		});
-	});
-
-	describe('setMetadata', () => {
-		it('sets metadata on execution data', () => {
-			const context = new ExecuteSingleContext(
-				workflow,
-				node,
-				additionalData,
-				mode,
-				runExecutionData,
-				runIndex,
-				connectionInputData,
-				inputData,
-				itemIndex,
-				executeData,
-				abortSignal,
-			);
-
-			const metadata: ITaskMetadata = {
-				subExecution: {
-					workflowId: '123',
-					executionId: 'xyz',
-				},
-			};
-
-			expect(context.getExecuteData().metadata?.subExecution).toEqual(undefined);
-			context.setMetadata(metadata);
-			expect(context.getExecuteData().metadata?.subExecution).toEqual(metadata.subExecution);
-		});
-	});
 });
diff --git a/packages/core/src/node-execution-context/__tests__/base-context.test.ts b/packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts
similarity index 99%
rename from packages/core/src/node-execution-context/__tests__/base-context.test.ts
rename to packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts
index aadc630a38..95ed62337e 100644
--- a/packages/core/src/node-execution-context/__tests__/base-context.test.ts
+++ b/packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts
@@ -14,7 +14,7 @@ import { NodeExecutionContext } from '../node-execution-context';
 
 class TestContext extends NodeExecutionContext {}
 
-describe('BaseContext', () => {
+describe('NodeExecutionContext', () => {
 	const instanceSettings = mock<InstanceSettings>({ instanceId: 'abc123' });
 	Container.set(InstanceSettings, instanceSettings);
 
diff --git a/packages/core/src/node-execution-context/__tests__/shared-tests.ts b/packages/core/src/node-execution-context/__tests__/shared-tests.ts
new file mode 100644
index 0000000000..c7262554d0
--- /dev/null
+++ b/packages/core/src/node-execution-context/__tests__/shared-tests.ts
@@ -0,0 +1,181 @@
+import { captor, mock } from 'jest-mock-extended';
+import type {
+	IRunExecutionData,
+	ContextType,
+	IContextObject,
+	INode,
+	OnError,
+	Workflow,
+	ITaskMetadata,
+	ISourceData,
+	IExecuteData,
+} from 'n8n-workflow';
+import { ApplicationError, NodeHelpers } from 'n8n-workflow';
+
+import type { BaseExecuteContext } from '../base-execute-context';
+
+export const describeCommonTests = (
+	context: BaseExecuteContext,
+	{
+		abortSignal,
+		node,
+		workflow,
+		runExecutionData,
+		executeData,
+	}: {
+		abortSignal: AbortSignal;
+		node: INode;
+		workflow: Workflow;
+		runExecutionData: IRunExecutionData;
+		executeData: IExecuteData;
+	},
+) => {
+	// @ts-expect-error `additionalData` is private
+	const { additionalData } = context;
+
+	describe('getExecutionCancelSignal', () => {
+		it('should return the abort signal', () => {
+			expect(context.getExecutionCancelSignal()).toBe(abortSignal);
+		});
+	});
+
+	describe('onExecutionCancellation', () => {
+		const handler = jest.fn();
+		context.onExecutionCancellation(handler);
+
+		const fnCaptor = captor<() => void>();
+		expect(abortSignal.addEventListener).toHaveBeenCalledWith('abort', fnCaptor);
+		expect(handler).not.toHaveBeenCalled();
+
+		fnCaptor.value();
+		expect(abortSignal.removeEventListener).toHaveBeenCalledWith('abort', fnCaptor);
+		expect(handler).toHaveBeenCalled();
+	});
+
+	describe('continueOnFail', () => {
+		afterEach(() => {
+			node.onError = undefined;
+			node.continueOnFail = false;
+		});
+
+		it('should return false for nodes by default', () => {
+			expect(context.continueOnFail()).toEqual(false);
+		});
+
+		it('should return true if node has continueOnFail set to true', () => {
+			node.continueOnFail = true;
+			expect(context.continueOnFail()).toEqual(true);
+		});
+
+		test.each([
+			['continueRegularOutput', true],
+			['continueErrorOutput', true],
+			['stopWorkflow', false],
+		])('if node has onError set to %s, it should return %s', (onError, expected) => {
+			node.onError = onError as OnError;
+			expect(context.continueOnFail()).toEqual(expected);
+		});
+	});
+
+	describe('getContext', () => {
+		it('should return the context object', () => {
+			const contextType: ContextType = 'node';
+			const expectedContext = mock<IContextObject>();
+			const getContextSpy = jest.spyOn(NodeHelpers, 'getContext');
+			getContextSpy.mockReturnValue(expectedContext);
+
+			expect(context.getContext(contextType)).toEqual(expectedContext);
+
+			expect(getContextSpy).toHaveBeenCalledWith(runExecutionData, contextType, node);
+
+			getContextSpy.mockRestore();
+		});
+	});
+
+	describe('sendMessageToUI', () => {
+		it('should send console messages to the frontend', () => {
+			context.sendMessageToUI('Testing', 1, 2, {});
+			expect(additionalData.sendDataToUI).toHaveBeenCalledWith('sendConsoleMessage', {
+				source: '[Node: "Test Node"]',
+				messages: ['Testing', 1, 2, {}],
+			});
+		});
+	});
+
+	describe('logAiEvent', () => {
+		it('should log the AI event correctly', () => {
+			const eventName = 'ai-tool-called';
+			const msg = 'test message';
+
+			context.logAiEvent(eventName, msg);
+
+			expect(additionalData.logAiEvent).toHaveBeenCalledWith(eventName, {
+				executionId: additionalData.executionId,
+				nodeName: node.name,
+				workflowName: workflow.name,
+				nodeType: node.type,
+				workflowId: workflow.id,
+				msg,
+			});
+		});
+	});
+
+	describe('getInputSourceData', () => {
+		it('should return the input source data correctly', () => {
+			const inputSourceData = mock<ISourceData>();
+			executeData.source = { main: [inputSourceData] };
+
+			expect(context.getInputSourceData()).toEqual(inputSourceData);
+		});
+
+		it('should throw an error if the source data is missing', () => {
+			executeData.source = null;
+
+			expect(() => context.getInputSourceData()).toThrow(ApplicationError);
+		});
+	});
+
+	describe('setMetadata', () => {
+		it('sets metadata on execution data', () => {
+			const metadata: ITaskMetadata = {
+				subExecution: {
+					workflowId: '123',
+					executionId: 'xyz',
+				},
+			};
+
+			expect(context.getExecuteData().metadata?.subExecution).toEqual(undefined);
+			context.setMetadata(metadata);
+			expect(context.getExecuteData().metadata?.subExecution).toEqual(metadata.subExecution);
+		});
+	});
+
+	describe('evaluateExpression', () => {
+		it('should evaluate the expression correctly', () => {
+			const expression = '$json.test';
+			const expectedResult = 'data';
+			const resolveSimpleParameterValueSpy = jest.spyOn(
+				workflow.expression,
+				'resolveSimpleParameterValue',
+			);
+			resolveSimpleParameterValueSpy.mockReturnValue(expectedResult);
+
+			expect(context.evaluateExpression(expression, 0)).toEqual(expectedResult);
+
+			expect(resolveSimpleParameterValueSpy).toHaveBeenCalledWith(
+				`=${expression}`,
+				{},
+				runExecutionData,
+				0,
+				0,
+				node.name,
+				[],
+				'manual',
+				expect.objectContaining({}),
+				executeData,
+			);
+
+			resolveSimpleParameterValueSpy.mockRestore();
+		});
+	});
+};
diff --git a/packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts b/packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts
new file mode 100644
index 0000000000..6c5a3849dd
--- /dev/null
+++ b/packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts
@@ -0,0 +1,171 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	INode,
+	IWorkflowExecuteAdditionalData,
+	IRunExecutionData,
+	INodeExecutionData,
+	ITaskDataConnections,
+	IExecuteData,
+	Workflow,
+	WorkflowExecuteMode,
+	ICredentialsHelper,
+	Expression,
+	INodeType,
+	INodeTypes,
+	ICredentialDataDecryptedObject,
+} from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
+
+import { describeCommonTests } from './shared-tests';
+import { SupplyDataContext } from '../supply-data-context';
+
+describe('SupplyDataContext', () => {
+	const testCredentialType = 'testCredential';
+	const nodeType = mock<INodeType>({
+		description: {
+			credentials: [
+				{
+					name: testCredentialType,
+					required: true,
+				},
+			],
+			properties: [
+				{
+					name: 'testParameter',
+					required: true,
+				},
+			],
+		},
+	});
+	const nodeTypes = mock<INodeTypes>();
+	const expression = mock<Expression>();
+	const workflow = mock<Workflow>({ expression, nodeTypes });
+	const node = mock<INode>({
+		name: 'Test Node',
+		credentials: {
+			[testCredentialType]: {
+				id: 'testCredentialId',
+			},
+		},
+	});
+	node.parameters = {
+		testParameter: 'testValue',
+	};
+	const credentialsHelper = mock<ICredentialsHelper>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ credentialsHelper });
+	const mode: WorkflowExecuteMode = 'manual';
+	const runExecutionData = mock<IRunExecutionData>();
+	const connectionInputData: INodeExecutionData[] = [];
+	const inputData: ITaskDataConnections = { main: [[{ json: { test: 'data' } }]] };
+	const executeData = mock<IExecuteData>();
+	const runIndex = 0;
+	const closeFn = jest.fn();
+	const abortSignal = mock<AbortSignal>();
+
+	const supplyDataContext = new SupplyDataContext(
+		workflow,
+		node,
+		additionalData,
+		mode,
+		runExecutionData,
+		runIndex,
+		connectionInputData,
+		inputData,
+		executeData,
+		[closeFn],
+		abortSignal,
+	);
+
+	beforeEach(() => {
+		nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+		expression.getParameterValue.mockImplementation((value) => value);
+	});
+
+	describeCommonTests(supplyDataContext, {
+		abortSignal,
+		node,
+		workflow,
+		executeData,
+		runExecutionData,
+	});
+
+	describe('getInputData', () => {
+		const inputIndex = 0;
+		const inputName = 'main';
+
+		afterEach(() => {
+			inputData[inputName] = [[{ json: { test: 'data' } }]];
+		});
+
+		it('should return the input data correctly', () => {
+			const expectedData = [{ json: { test: 'data' } }];
+
+			expect(supplyDataContext.getInputData(inputIndex, inputName)).toEqual(expectedData);
+		});
+
+		it('should return an empty array if the input name does not exist', () => {
+			const inputName = 'nonExistent';
+			expect(supplyDataContext.getInputData(inputIndex, inputName)).toEqual([]);
+		});
+
+		it('should throw an error if the input index is out of range', () => {
+			const inputIndex = 2;
+
+			expect(() => supplyDataContext.getInputData(inputIndex, inputName)).toThrow(ApplicationError);
+		});
+
+		it('should throw an error if the input index was not set', () => {
+			inputData.main[inputIndex] = null;
+
+			expect(() => supplyDataContext.getInputData(inputIndex, inputName)).toThrow(ApplicationError);
+		});
+	});
+
+	describe('getNodeParameter', () => {
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			expression.getParameterValue.mockImplementation((value) => value);
+		});
+
+		it('should return parameter value when it exists', () => {
+			const parameter = supplyDataContext.getNodeParameter('testParameter', 0);
+
+			expect(parameter).toBe('testValue');
+		});
+
+		it('should return the fallback value when the parameter does not exist', () => {
+			const parameter = supplyDataContext.getNodeParameter('otherParameter', 0, 'fallback');
+
+			expect(parameter).toBe('fallback');
+		});
+	});
+
+	describe('getCredentials', () => {
+		it('should get decrypted credentials', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			credentialsHelper.getDecrypted.mockResolvedValue({ secret: 'token' });
+
+			const credentials = await supplyDataContext.getCredentials<ICredentialDataDecryptedObject>(
+				testCredentialType,
+				0,
+			);
+
+			expect(credentials).toEqual({ secret: 'token' });
+		});
+	});
+
+	describe('getWorkflowDataProxy', () => {
+		it('should return the workflow data proxy correctly', () => {
+			const workflowDataProxy = supplyDataContext.getWorkflowDataProxy(0);
+			expect(workflowDataProxy.isProxy).toBe(true);
+			expect(Object.keys(workflowDataProxy.$input)).toEqual([
+				'all',
+				'context',
+				'first',
+				'item',
+				'last',
+				'params',
+			]);
+		});
+	});
+});
diff --git a/packages/core/test/Validation.test.ts b/packages/core/src/node-execution-context/__tests__/utils.test.ts
similarity index 59%
rename from packages/core/test/Validation.test.ts
rename to packages/core/src/node-execution-context/__tests__/utils.test.ts
index 04ad3c134e..1871af4c0d 100644
--- a/packages/core/test/Validation.test.ts
+++ b/packages/core/src/node-execution-context/__tests__/utils.test.ts
@@ -1,8 +1,121 @@
-import type { IDataObject, INode, INodeType } from 'n8n-workflow';
+import toPlainObject from 'lodash/toPlainObject';
+import { DateTime } from 'luxon';
+import type { IDataObject, INode, INodeType, NodeParameterValue } from 'n8n-workflow';
+import { ExpressionError } from 'n8n-workflow';
 
-import { validateValueAgainstSchema } from '@/NodeExecuteFunctions';
+import { cleanupParameterData, ensureType, validateValueAgainstSchema } from '../utils';
 
-describe('Validation', () => {
+describe('cleanupParameterData', () => {
+	it('should stringify Luxon dates in-place', () => {
+		const input = { x: 1, y: DateTime.now() as unknown as NodeParameterValue };
+		expect(typeof input.y).toBe('object');
+		cleanupParameterData(input);
+		expect(typeof input.y).toBe('string');
+	});
+
+	it('should stringify plain Luxon dates in-place', () => {
+		const input = {
+			x: 1,
+			y: toPlainObject(DateTime.now()),
+		};
+		expect(typeof input.y).toBe('object');
+		cleanupParameterData(input);
+		expect(typeof input.y).toBe('string');
+	});
+
+	it('should handle objects with nameless constructors', () => {
+		const input = { x: 1, y: { constructor: {} } as NodeParameterValue };
+		expect(typeof input.y).toBe('object');
+		cleanupParameterData(input);
+		expect(typeof input.y).toBe('object');
+	});
+
+	it('should handle objects without a constructor', () => {
+		const input = { x: 1, y: { constructor: undefined } as unknown as NodeParameterValue };
+		expect(typeof input.y).toBe('object');
+		cleanupParameterData(input);
+		expect(typeof input.y).toBe('object');
+	});
+});
+
+describe('ensureType', () => {
+	it('throws error for null value', () => {
+		expect(() => ensureType('string', null, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' must not be null"),
+		);
+	});
+
+	it('throws error for undefined value', () => {
+		expect(() => ensureType('string', undefined, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' could not be 'undefined'"),
+		);
+	});
+
+	it('returns string value without modification', () => {
+		const value = 'hello';
+		const expectedValue = value;
+		const result = ensureType('string', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('returns number value without modification', () => {
+		const value = 42;
+		const expectedValue = value;
+		const result = ensureType('number', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('returns boolean value without modification', () => {
+		const value = true;
+		const expectedValue = value;
+		const result = ensureType('boolean', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('converts object to string if toType is string', () => {
+		const value = { name: 'John' };
+		const expectedValue = JSON.stringify(value);
+		const result = ensureType('string', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('converts string to number if toType is number', () => {
+		const value = '10';
+		const expectedValue = 10;
+		const result = ensureType('number', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('throws error for invalid conversion to number', () => {
+		const value = 'invalid';
+		expect(() => ensureType('number', value, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' must be a number, but we got 'invalid'"),
+		);
+	});
+
+	it('parses valid JSON string to object if toType is object', () => {
+		const value = '{"name": "Alice"}';
+		const expectedValue = JSON.parse(value);
+		const result = ensureType('object', value, 'myParam');
+		expect(result).toEqual(expectedValue);
+	});
+
+	it('throws error for invalid JSON string to object conversion', () => {
+		const value = 'invalid_json';
+		expect(() => ensureType('object', value, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' could not be parsed"),
+		);
+	});
+
+	it('throws error for non-array value if toType is array', () => {
+		const value = { name: 'Alice' };
+		expect(() => ensureType('array', value, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' must be an array, but we got object"),
+		);
+	});
+});
+
+describe('validateValueAgainstSchema', () => {
 	test('should validate fixedCollection values parameter', () => {
 		const nodeType = {
 			description: {
diff --git a/packages/core/src/node-execution-context/base-execute-context.ts b/packages/core/src/node-execution-context/base-execute-context.ts
new file mode 100644
index 0000000000..c13ba66dc2
--- /dev/null
+++ b/packages/core/src/node-execution-context/base-execute-context.ts
@@ -0,0 +1,213 @@
+import { get } from 'lodash';
+import type {
+	Workflow,
+	INode,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+	IRunExecutionData,
+	INodeExecutionData,
+	ITaskDataConnections,
+	IExecuteData,
+	ICredentialDataDecryptedObject,
+	CallbackManager,
+	IExecuteWorkflowInfo,
+	RelatedExecution,
+	ExecuteWorkflowData,
+	ITaskMetadata,
+	ContextType,
+	IContextObject,
+	INodeInputConfiguration,
+	INodeOutputConfiguration,
+	IWorkflowDataProxyData,
+	ISourceData,
+	AiEvent,
+} from 'n8n-workflow';
+import { ApplicationError, NodeHelpers, WorkflowDataProxy } from 'n8n-workflow';
+import { Container } from 'typedi';
+
+import { BinaryDataService } from '@/BinaryData/BinaryData.service';
+
+import { NodeExecutionContext } from './node-execution-context';
+
+export class BaseExecuteContext extends NodeExecutionContext {
+	protected readonly binaryDataService = Container.get(BinaryDataService);
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		protected readonly runExecutionData: IRunExecutionData,
+		runIndex: number,
+		protected readonly connectionInputData: INodeExecutionData[],
+		protected readonly inputData: ITaskDataConnections,
+		protected readonly executeData: IExecuteData,
+		protected readonly abortSignal?: AbortSignal,
+	) {
+		super(workflow, node, additionalData, mode, runExecutionData, runIndex);
+	}
+
+	getExecutionCancelSignal() {
+		return this.abortSignal;
+	}
+
+	onExecutionCancellation(handler: () => unknown) {
+		const fn = () => {
+			this.abortSignal?.removeEventListener('abort', fn);
+			handler();
+		};
+		this.abortSignal?.addEventListener('abort', fn);
+	}
+
+	getExecuteData() {
+		return this.executeData;
+	}
+
+	setMetadata(metadata: ITaskMetadata): void {
+		this.executeData.metadata = {
+			...(this.executeData.metadata ?? {}),
+			...metadata,
+		};
+	}
+
+	getContext(type: ContextType): IContextObject {
+		return NodeHelpers.getContext(this.runExecutionData, type, this.node);
+	}
+
+	/** Returns if execution should be continued even if there was an error */
+	continueOnFail(): boolean {
+		const onError = get(this.node, 'onError', undefined);
+
+		if (onError === undefined) {
+			return get(this.node, 'continueOnFail', false);
+		}
+
+		return ['continueRegularOutput', 'continueErrorOutput'].includes(onError);
+	}
+
+	async getCredentials<T extends object = ICredentialDataDecryptedObject>(
+		type: string,
+		itemIndex: number,
+	) {
+		return await this._getCredentials<T>(
+			type,
+			this.executeData,
+			this.connectionInputData,
+			itemIndex,
+		);
+	}
+
+	async executeWorkflow(
+		workflowInfo: IExecuteWorkflowInfo,
+		inputData?: INodeExecutionData[],
+		parentCallbackManager?: CallbackManager,
+		options?: {
+			doNotWaitToFinish?: boolean;
+			parentExecution?: RelatedExecution;
+		},
+	): Promise<ExecuteWorkflowData> {
+		return await this.additionalData
+			.executeWorkflow(workflowInfo, this.additionalData, {
+				...options,
+				parentWorkflowId: this.workflow.id?.toString(),
+				inputData,
+				parentWorkflowSettings: this.workflow.settings,
+				node: this.node,
+				parentCallbackManager,
+			})
+			.then(async (result) => {
+				const data = await this.binaryDataService.duplicateBinaryData(
+					this.workflow.id,
+					this.additionalData.executionId!,
+					result.data,
+				);
+				return { ...result, data };
+			});
+	}
+
+	getNodeInputs(): INodeInputConfiguration[] {
+		const nodeType = this.workflow.nodeTypes.getByNameAndVersion(
+			this.node.type,
+			this.node.typeVersion,
+		);
+		return NodeHelpers.getNodeInputs(this.workflow, this.node, nodeType.description).map((input) =>
+			typeof input === 'string' ? { type: input } : input,
+		);
+	}
+
+	getNodeOutputs(): INodeOutputConfiguration[] {
+		const nodeType = this.workflow.nodeTypes.getByNameAndVersion(
+			this.node.type,
+			this.node.typeVersion,
+		);
+		return NodeHelpers.getNodeOutputs(this.workflow, this.node, nodeType.description).map(
+			(output) => (typeof output === 'string' ? { type: output } : output),
+		);
+	}
+
+	getInputSourceData(inputIndex = 0, inputName = 'main'): ISourceData {
+		if (this.executeData?.source === null) {
+			// Should never happen as n8n sets it automatically
+			throw new ApplicationError('Source data is missing');
+		}
+		return this.executeData.source[inputName][inputIndex]!;
+	}
+
+	getWorkflowDataProxy(itemIndex: number): IWorkflowDataProxyData {
+		return new WorkflowDataProxy(
+			this.workflow,
+			this.runExecutionData,
+			this.runIndex,
+			itemIndex,
+			this.node.name,
+			this.connectionInputData,
+			{},
+			this.mode,
+			this.additionalKeys,
+			this.executeData,
+		).getDataProxy();
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	sendMessageToUI(...args: any[]): void {
+		if (this.mode !== 'manual') {
+			return;
+		}
+		try {
+			if (this.additionalData.sendDataToUI) {
+				args = args.map((arg) => {
+					// prevent invalid dates from being logged as null
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
+					if (arg.isLuxonDateTime && arg.invalidReason) return { ...arg };
+
+					// log valid dates in human readable format, as in browser
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+					if (arg.isLuxonDateTime) return new Date(arg.ts).toString();
+					if (arg instanceof Date) return arg.toString();
+
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+					return arg;
+				});
+
+				this.additionalData.sendDataToUI('sendConsoleMessage', {
+					source: `[Node: "${this.node.name}"]`,
+					messages: args,
+				});
+			}
+		} catch (error) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+			this.logger.warn(`There was a problem sending message to UI: ${error.message}`);
+		}
+	}
+
+	logAiEvent(eventName: AiEvent, msg: string) {
+		return this.additionalData.logAiEvent(eventName, {
+			executionId: this.additionalData.executionId ?? 'unsaved-execution',
+			nodeName: this.node.name,
+			workflowName: this.workflow.name ?? 'Unnamed workflow',
+			nodeType: this.node.type,
+			workflowId: this.workflow.id ?? 'unsaved-workflow',
+			msg,
+		});
+	}
+}
diff --git a/packages/core/src/node-execution-context/execute-context.ts b/packages/core/src/node-execution-context/execute-context.ts
new file mode 100644
index 0000000000..514c9cf27f
--- /dev/null
+++ b/packages/core/src/node-execution-context/execute-context.ts
@@ -0,0 +1,263 @@
+import type {
+	CallbackManager,
+	CloseFunction,
+	ExecutionBaseError,
+	IExecuteData,
+	IExecuteFunctions,
+	IExecuteResponsePromiseData,
+	IGetNodeParameterOptions,
+	INode,
+	INodeExecutionData,
+	IRunExecutionData,
+	ITaskDataConnections,
+	ITaskMetadata,
+	IWorkflowExecuteAdditionalData,
+	NodeConnectionType,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
+
+import { createAgentStartJob } from '@/Agent';
+// eslint-disable-next-line import/no-cycle
+import {
+	returnJsonArray,
+	copyInputItems,
+	normalizeItems,
+	constructExecutionMetaData,
+	getInputConnectionData,
+	addExecutionDataFunctions,
+	assertBinaryData,
+	getBinaryDataBuffer,
+	copyBinaryFile,
+	getRequestHelperFunctions,
+	getBinaryHelperFunctions,
+	getSSHTunnelFunctions,
+	getFileSystemHelperFunctions,
+	getCheckProcessedHelperFunctions,
+} from '@/NodeExecuteFunctions';
+
+import { BaseExecuteContext } from './base-execute-context';
+
+export class ExecuteContext extends BaseExecuteContext implements IExecuteFunctions {
+	readonly helpers: IExecuteFunctions['helpers'];
+
+	readonly nodeHelpers: IExecuteFunctions['nodeHelpers'];
+
+	readonly getNodeParameter: IExecuteFunctions['getNodeParameter'];
+
+	readonly startJob: IExecuteFunctions['startJob'];
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		runExecutionData: IRunExecutionData,
+		runIndex: number,
+		connectionInputData: INodeExecutionData[],
+		inputData: ITaskDataConnections,
+		executeData: IExecuteData,
+		private readonly closeFunctions: CloseFunction[],
+		abortSignal?: AbortSignal,
+	) {
+		super(
+			workflow,
+			node,
+			additionalData,
+			mode,
+			runExecutionData,
+			runIndex,
+			connectionInputData,
+			inputData,
+			executeData,
+			abortSignal,
+		);
+
+		this.helpers = {
+			createDeferredPromise,
+			returnJsonArray,
+			copyInputItems,
+			normalizeItems,
+			constructExecutionMetaData,
+			...getRequestHelperFunctions(
+				workflow,
+				node,
+				additionalData,
+				runExecutionData,
+				connectionInputData,
+			),
+			...getBinaryHelperFunctions(additionalData, workflow.id),
+			...getSSHTunnelFunctions(),
+			...getFileSystemHelperFunctions(node),
+			...getCheckProcessedHelperFunctions(workflow, node),
+
+			assertBinaryData: (itemIndex, propertyName) =>
+				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
+			getBinaryDataBuffer: async (itemIndex, propertyName) =>
+				await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
+		};
+
+		this.nodeHelpers = {
+			copyBinaryFile: async (filePath, fileName, mimeType) =>
+				await copyBinaryFile(
+					this.workflow.id,
+					this.additionalData.executionId!,
+					filePath,
+					fileName,
+					mimeType,
+				),
+		};
+
+		this.getNodeParameter = ((
+			parameterName: string,
+			itemIndex: number,
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			fallbackValue?: any,
+			options?: IGetNodeParameterOptions,
+		) =>
+			this._getNodeParameter(
+				parameterName,
+				itemIndex,
+				fallbackValue,
+				options,
+			)) as IExecuteFunctions['getNodeParameter'];
+
+		this.startJob = createAgentStartJob(
+			this.additionalData,
+			this.inputData,
+			this.node,
+			this.workflow,
+			this.runExecutionData,
+			this.runIndex,
+			this.node.name,
+			this.connectionInputData,
+			{},
+			this.mode,
+			this.executeData,
+		);
+	}
+
+	async getInputConnectionData(inputName: NodeConnectionType, itemIndex: number): Promise<unknown> {
+		return await getInputConnectionData.call(
+			this,
+			this.workflow,
+			this.runExecutionData,
+			this.runIndex,
+			this.connectionInputData,
+			this.inputData,
+			this.additionalData,
+			this.executeData,
+			this.mode,
+			this.closeFunctions,
+			inputName,
+			itemIndex,
+			this.abortSignal,
+		);
+	}
+
+	getInputData(inputIndex = 0, inputName = 'main') {
+		if (!this.inputData.hasOwnProperty(inputName)) {
+			// Return empty array because else it would throw error when nothing is connected to input
+			return [];
+		}
+
+		const inputData = this.inputData[inputName];
+		// TODO: Check if nodeType has input with that index defined
+		if (inputData.length < inputIndex) {
+			throw new ApplicationError('Could not get input with given index', {
+				extra: { inputIndex, inputName },
+			});
+		}
+
+		if (inputData[inputIndex] === null) {
+			throw new ApplicationError('Value of input was not set', {
+				extra: { inputIndex, inputName },
+			});
+		}
+
+		return inputData[inputIndex];
+	}
+
+	async putExecutionToWait(waitTill: Date): Promise<void> {
+		this.runExecutionData.waitTill = waitTill;
+		if (this.additionalData.setExecutionStatus) {
+			this.additionalData.setExecutionStatus('waiting');
+		}
+	}
+
+	logNodeOutput(...args: unknown[]): void {
+		if (this.mode === 'manual') {
+			this.sendMessageToUI(...args);
+			return;
+		}
+
+		if (process.env.CODE_ENABLE_STDOUT === 'true') {
+			console.log(`[Workflow "${this.getWorkflow().id}"][Node "${this.node.name}"]`, ...args);
+		}
+	}
+
+	async sendResponse(response: IExecuteResponsePromiseData): Promise<void> {
+		await this.additionalData.hooks?.executeHookFunctions('sendResponse', [response]);
+	}
+
+	addInputData(
+		connectionType: NodeConnectionType,
+		data: INodeExecutionData[][] | ExecutionBaseError,
+	): { index: number } {
+		const nodeName = this.node.name;
+		let currentNodeRunIndex = 0;
+		if (this.runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
+			currentNodeRunIndex = this.runExecutionData.resultData.runData[nodeName].length;
+		}
+
+		void addExecutionDataFunctions(
+			'input',
+			nodeName,
+			data,
+			this.runExecutionData,
+			connectionType,
+			this.additionalData,
+			nodeName,
+			this.runIndex,
+			currentNodeRunIndex,
+		).catch((error) => {
+			this.logger.warn(
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				`There was a problem logging input data of node "${nodeName}": ${error.message}`,
+			);
+		});
+
+		return { index: currentNodeRunIndex };
+	}
+
+	addOutputData(
+		connectionType: NodeConnectionType,
+		currentNodeRunIndex: number,
+		data: INodeExecutionData[][] | ExecutionBaseError,
+		metadata?: ITaskMetadata,
+	): void {
+		const nodeName = this.node.name;
+		addExecutionDataFunctions(
+			'output',
+			nodeName,
+			data,
+			this.runExecutionData,
+			connectionType,
+			this.additionalData,
+			nodeName,
+			this.runIndex,
+			currentNodeRunIndex,
+			metadata,
+		).catch((error) => {
+			this.logger.warn(
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				`There was a problem logging output data of node "${nodeName}": ${error.message}`,
+			);
+		});
+	}
+
+	getParentCallbackManager(): CallbackManager | undefined {
+		return this.additionalData.parentCallbackManager;
+	}
+}
diff --git a/packages/core/src/node-execution-context/execute-single-context.ts b/packages/core/src/node-execution-context/execute-single-context.ts
index dd08aa0fc6..91c7fcf683 100644
--- a/packages/core/src/node-execution-context/execute-single-context.ts
+++ b/packages/core/src/node-execution-context/execute-single-context.ts
@@ -10,34 +10,21 @@ import type {
 	WorkflowExecuteMode,
 	ITaskDataConnections,
 	IExecuteData,
-	ContextType,
-	AiEvent,
-	ISourceData,
-	ITaskMetadata,
-} from 'n8n-workflow';
-import {
-	ApplicationError,
-	createDeferredPromise,
-	NodeHelpers,
-	WorkflowDataProxy,
 } from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
 	assertBinaryData,
-	continueOnFail,
-	getAdditionalKeys,
 	getBinaryDataBuffer,
 	getBinaryHelperFunctions,
-	getCredentials,
-	getNodeParameter,
 	getRequestHelperFunctions,
 	returnJsonArray,
 } from '@/NodeExecuteFunctions';
 
-import { NodeExecutionContext } from './node-execution-context';
+import { BaseExecuteContext } from './base-execute-context';
 
-export class ExecuteSingleContext extends NodeExecutionContext implements IExecuteSingleFunctions {
+export class ExecuteSingleContext extends BaseExecuteContext implements IExecuteSingleFunctions {
 	readonly helpers: IExecuteSingleFunctions['helpers'];
 
 	constructor(
@@ -45,15 +32,26 @@ export class ExecuteSingleContext extends NodeExecutionContext implements IExecu
 		node: INode,
 		additionalData: IWorkflowExecuteAdditionalData,
 		mode: WorkflowExecuteMode,
-		private readonly runExecutionData: IRunExecutionData,
-		private readonly runIndex: number,
-		private readonly connectionInputData: INodeExecutionData[],
-		private readonly inputData: ITaskDataConnections,
+		runExecutionData: IRunExecutionData,
+		runIndex: number,
+		connectionInputData: INodeExecutionData[],
+		inputData: ITaskDataConnections,
 		private readonly itemIndex: number,
-		private readonly executeData: IExecuteData,
-		private readonly abortSignal?: AbortSignal,
+		executeData: IExecuteData,
+		abortSignal?: AbortSignal,
 	) {
-		super(workflow, node, additionalData, mode);
+		super(
+			workflow,
+			node,
+			additionalData,
+			mode,
+			runExecutionData,
+			runIndex,
+			connectionInputData,
+			inputData,
+			executeData,
+			abortSignal,
+		);
 
 		this.helpers = {
 			createDeferredPromise,
@@ -74,47 +72,8 @@ export class ExecuteSingleContext extends NodeExecutionContext implements IExecu
 		};
 	}
 
-	getExecutionCancelSignal() {
-		return this.abortSignal;
-	}
-
-	onExecutionCancellation(handler: () => unknown) {
-		const fn = () => {
-			this.abortSignal?.removeEventListener('abort', fn);
-			handler();
-		};
-		this.abortSignal?.addEventListener('abort', fn);
-	}
-
-	setMetadata(metadata: ITaskMetadata): void {
-		this.executeData.metadata = {
-			...(this.executeData.metadata ?? {}),
-			...metadata,
-		};
-	}
-
-	continueOnFail() {
-		return continueOnFail(this.node);
-	}
-
-	evaluateExpression(expression: string, evaluateItemIndex: number | undefined) {
-		evaluateItemIndex = evaluateItemIndex ?? this.itemIndex;
-		return this.workflow.expression.resolveSimpleParameterValue(
-			`=${expression}`,
-			{},
-			this.runExecutionData,
-			this.runIndex,
-			evaluateItemIndex,
-			this.node.name,
-			this.connectionInputData,
-			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, this.runExecutionData),
-			this.executeData,
-		);
-	}
-
-	getContext(type: ContextType) {
-		return NodeHelpers.getContext(this.runExecutionData, type, this.node);
+	evaluateExpression(expression: string, itemIndex: number = this.itemIndex) {
+		return super.evaluateExpression(expression, itemIndex);
 	}
 
 	getInputData(inputIndex = 0, inputName = 'main') {
@@ -154,73 +113,14 @@ export class ExecuteSingleContext extends NodeExecutionContext implements IExecu
 
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	getNodeParameter(parameterName: string, fallbackValue?: any, options?: IGetNodeParameterOptions) {
-		return getNodeParameter(
-			this.workflow,
-			this.runExecutionData,
-			this.runIndex,
-			this.connectionInputData,
-			this.node,
-			parameterName,
-			this.itemIndex,
-			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, this.runExecutionData),
-			this.executeData,
-			fallbackValue,
-			options,
-		);
+		return this._getNodeParameter(parameterName, this.itemIndex, fallbackValue, options);
 	}
 
-	// TODO: extract out in a BaseExecutionContext
 	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
-		return await getCredentials<T>(
-			this.workflow,
-			this.node,
-			type,
-			this.additionalData,
-			this.mode,
-			this.executeData,
-			this.runExecutionData,
-			this.runIndex,
-			this.connectionInputData,
-			this.itemIndex,
-		);
-	}
-
-	getExecuteData() {
-		return this.executeData;
+		return await super.getCredentials<T>(type, this.itemIndex);
 	}
 
 	getWorkflowDataProxy() {
-		return new WorkflowDataProxy(
-			this.workflow,
-			this.runExecutionData,
-			this.runIndex,
-			this.itemIndex,
-			this.node.name,
-			this.connectionInputData,
-			{},
-			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, this.runExecutionData),
-			this.executeData,
-		).getDataProxy();
-	}
-
-	getInputSourceData(inputIndex = 0, inputName = 'main'): ISourceData {
-		if (this.executeData?.source === null) {
-			// Should never happen as n8n sets it automatically
-			throw new ApplicationError('Source data is missing');
-		}
-		return this.executeData.source[inputName][inputIndex] as ISourceData;
-	}
-
-	logAiEvent(eventName: AiEvent, msg: string) {
-		return this.additionalData.logAiEvent(eventName, {
-			executionId: this.additionalData.executionId ?? 'unsaved-execution',
-			nodeName: this.node.name,
-			workflowName: this.workflow.name ?? 'Unnamed workflow',
-			nodeType: this.node.type,
-			workflowId: this.workflow.id ?? 'unsaved-workflow',
-			msg,
-		});
+		return super.getWorkflowDataProxy(this.itemIndex);
 	}
 }
diff --git a/packages/core/src/node-execution-context/helpers/binary-helpers.ts b/packages/core/src/node-execution-context/helpers/binary-helpers.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/core/src/node-execution-context/hook-context.ts b/packages/core/src/node-execution-context/hook-context.ts
index 5585d6b8f3..102be563a1 100644
--- a/packages/core/src/node-execution-context/hook-context.ts
+++ b/packages/core/src/node-execution-context/hook-context.ts
@@ -1,12 +1,8 @@
 import type {
 	ICredentialDataDecryptedObject,
-	IGetNodeParameterOptions,
 	INode,
-	INodeExecutionData,
 	IHookFunctions,
-	IRunExecutionData,
 	IWorkflowExecuteAdditionalData,
-	NodeParameterValueType,
 	Workflow,
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
@@ -17,9 +13,6 @@ import { ApplicationError } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
-	getAdditionalKeys,
-	getCredentials,
-	getNodeParameter,
 	getNodeWebhookUrl,
 	getRequestHelperFunctions,
 	getWebhookDescription,
@@ -48,34 +41,7 @@ export class HookContext extends NodeExecutionContext implements IHookFunctions
 	}
 
 	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
-		return await getCredentials<T>(this.workflow, this.node, type, this.additionalData, this.mode);
-	}
-
-	getNodeParameter(
-		parameterName: string,
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		fallbackValue?: any,
-		options?: IGetNodeParameterOptions,
-	): NodeParameterValueType | object {
-		const runExecutionData: IRunExecutionData | null = null;
-		const itemIndex = 0;
-		const runIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
-
-		return getNodeParameter(
-			this.workflow,
-			runExecutionData,
-			runIndex,
-			connectionInputData,
-			this.node,
-			parameterName,
-			itemIndex,
-			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, runExecutionData),
-			undefined,
-			fallbackValue,
-			options,
-		);
+		return await this._getCredentials<T>(type);
 	}
 
 	getNodeWebhookUrl(name: WebhookType): string | undefined {
@@ -85,7 +51,7 @@ export class HookContext extends NodeExecutionContext implements IHookFunctions
 			this.node,
 			this.additionalData,
 			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, null),
+			this.additionalKeys,
 			this.webhookData?.isTest,
 		);
 	}
diff --git a/packages/core/src/node-execution-context/index.ts b/packages/core/src/node-execution-context/index.ts
index d5c663b2ab..00c90266db 100644
--- a/packages/core/src/node-execution-context/index.ts
+++ b/packages/core/src/node-execution-context/index.ts
@@ -1,7 +1,11 @@
 // eslint-disable-next-line import/no-cycle
+export { ExecuteContext } from './execute-context';
 export { ExecuteSingleContext } from './execute-single-context';
 export { HookContext } from './hook-context';
 export { LoadOptionsContext } from './load-options-context';
 export { PollContext } from './poll-context';
+export { SupplyDataContext } from './supply-data-context';
 export { TriggerContext } from './trigger-context';
 export { WebhookContext } from './webhook-context';
+
+export { getAdditionalKeys } from './utils';
diff --git a/packages/core/src/node-execution-context/load-options-context.ts b/packages/core/src/node-execution-context/load-options-context.ts
index bb43d9c2e2..c961b56c06 100644
--- a/packages/core/src/node-execution-context/load-options-context.ts
+++ b/packages/core/src/node-execution-context/load-options-context.ts
@@ -3,9 +3,7 @@ import type {
 	ICredentialDataDecryptedObject,
 	IGetNodeParameterOptions,
 	INode,
-	INodeExecutionData,
 	ILoadOptionsFunctions,
-	IRunExecutionData,
 	IWorkflowExecuteAdditionalData,
 	NodeParameterValueType,
 	Workflow,
@@ -13,13 +11,7 @@ import type {
 
 import { extractValue } from '@/ExtractValue';
 // eslint-disable-next-line import/no-cycle
-import {
-	getAdditionalKeys,
-	getCredentials,
-	getNodeParameter,
-	getRequestHelperFunctions,
-	getSSHTunnelFunctions,
-} from '@/NodeExecuteFunctions';
+import { getRequestHelperFunctions, getSSHTunnelFunctions } from '@/NodeExecuteFunctions';
 
 import { NodeExecutionContext } from './node-execution-context';
 
@@ -41,7 +33,7 @@ export class LoadOptionsContext extends NodeExecutionContext implements ILoadOpt
 	}
 
 	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
-		return await getCredentials<T>(this.workflow, this.node, type, this.additionalData, this.mode);
+		return await this._getCredentials<T>(type);
 	}
 
 	getCurrentNodeParameter(
@@ -76,31 +68,4 @@ export class LoadOptionsContext extends NodeExecutionContext implements ILoadOpt
 	getCurrentNodeParameters() {
 		return this.additionalData.currentNodeParameters;
 	}
-
-	getNodeParameter(
-		parameterName: string,
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		fallbackValue?: any,
-		options?: IGetNodeParameterOptions,
-	): NodeParameterValueType | object {
-		const runExecutionData: IRunExecutionData | null = null;
-		const itemIndex = 0;
-		const runIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
-
-		return getNodeParameter(
-			this.workflow,
-			runExecutionData,
-			runIndex,
-			connectionInputData,
-			this.node,
-			parameterName,
-			itemIndex,
-			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, runExecutionData),
-			undefined,
-			fallbackValue,
-			options,
-		);
-	}
 }
diff --git a/packages/core/src/node-execution-context/node-execution-context.ts b/packages/core/src/node-execution-context/node-execution-context.ts
index 09c21b63a4..c4bb0739fb 100644
--- a/packages/core/src/node-execution-context/node-execution-context.ts
+++ b/packages/core/src/node-execution-context/node-execution-context.ts
@@ -1,17 +1,42 @@
+import { get } from 'lodash';
 import type {
 	FunctionsBase,
+	ICredentialDataDecryptedObject,
+	ICredentialsExpressionResolveValues,
+	IExecuteData,
+	IGetNodeParameterOptions,
 	INode,
+	INodeCredentialDescription,
+	INodeCredentialsDetails,
 	INodeExecutionData,
+	IRunExecutionData,
 	IWorkflowExecuteAdditionalData,
+	NodeParameterValueType,
 	NodeTypeAndVersion,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
-import { deepCopy, LoggerProxy } from 'n8n-workflow';
+import {
+	ApplicationError,
+	deepCopy,
+	ExpressionError,
+	LoggerProxy,
+	NodeHelpers,
+	NodeOperationError,
+} from 'n8n-workflow';
 import { Container } from 'typedi';
 
+import { HTTP_REQUEST_NODE_TYPE, HTTP_REQUEST_TOOL_NODE_TYPE } from '@/Constants';
+import { extractValue } from '@/ExtractValue';
 import { InstanceSettings } from '@/InstanceSettings';
 
+import {
+	cleanupParameterData,
+	ensureType,
+	getAdditionalKeys,
+	validateValueAgainstSchema,
+} from './utils';
+
 export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCredentials'> {
 	protected readonly instanceSettings = Container.get(InstanceSettings);
 
@@ -20,6 +45,10 @@ export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCr
 		protected readonly node: INode,
 		protected readonly additionalData: IWorkflowExecuteAdditionalData,
 		protected readonly mode: WorkflowExecuteMode,
+		protected readonly runExecutionData: IRunExecutionData | null = null,
+		protected readonly runIndex = 0,
+		protected readonly connectionInputData: INodeExecutionData[] = [],
+		protected readonly executeData?: IExecuteData,
 	) {}
 
 	get logger() {
@@ -101,6 +130,255 @@ export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCr
 		return this.additionalData.credentialsHelper.getCredentialsProperties(type);
 	}
 
+	/** Returns the requested decrypted credentials if the node has access to them */
+	protected async _getCredentials<T extends object = ICredentialDataDecryptedObject>(
+		type: string,
+		executeData?: IExecuteData,
+		connectionInputData?: INodeExecutionData[],
+		itemIndex?: number,
+	): Promise<T> {
+		const { workflow, node, additionalData, mode, runExecutionData, runIndex } = this;
+		// Get the NodeType as it has the information if the credentials are required
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		// Hardcode for now for security reasons that only a single node can access
+		// all credentials
+		const fullAccess = [HTTP_REQUEST_NODE_TYPE, HTTP_REQUEST_TOOL_NODE_TYPE].includes(node.type);
+
+		let nodeCredentialDescription: INodeCredentialDescription | undefined;
+		if (!fullAccess) {
+			if (nodeType.description.credentials === undefined) {
+				throw new NodeOperationError(
+					node,
+					`Node type "${node.type}" does not have any credentials defined`,
+					{ level: 'warning' },
+				);
+			}
+
+			nodeCredentialDescription = nodeType.description.credentials.find(
+				(credentialTypeDescription) => credentialTypeDescription.name === type,
+			);
+			if (nodeCredentialDescription === undefined) {
+				throw new NodeOperationError(
+					node,
+					`Node type "${node.type}" does not have any credentials of type "${type}" defined`,
+					{ level: 'warning' },
+				);
+			}
+
+			if (
+				!NodeHelpers.displayParameter(
+					// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+					additionalData.currentNodeParameters || node.parameters,
+					nodeCredentialDescription,
+					node,
+					node.parameters,
+				)
+			) {
+				// Credentials should not be displayed even if they would be defined
+				throw new NodeOperationError(node, 'Credentials not found');
+			}
+		}
+
+		// Check if node has any credentials defined
+		if (!fullAccess && !node.credentials?.[type]) {
+			// If none are defined check if the credentials are required or not
+
+			if (nodeCredentialDescription?.required === true) {
+				// Credentials are required so error
+				if (!node.credentials) {
+					throw new NodeOperationError(node, 'Node does not have any credentials set', {
+						level: 'warning',
+					});
+				}
+				if (!node.credentials[type]) {
+					throw new NodeOperationError(
+						node,
+						`Node does not have any credentials set for "${type}"`,
+						{
+							level: 'warning',
+						},
+					);
+				}
+			} else {
+				// Credentials are not required
+				throw new NodeOperationError(node, 'Node does not require credentials');
+			}
+		}
+
+		if (fullAccess && !node.credentials?.[type]) {
+			// Make sure that fullAccess nodes still behave like before that if they
+			// request access to credentials that are currently not set it returns undefined
+			throw new NodeOperationError(node, 'Credentials not found');
+		}
+
+		let expressionResolveValues: ICredentialsExpressionResolveValues | undefined;
+		if (connectionInputData && runExecutionData && runIndex !== undefined) {
+			expressionResolveValues = {
+				connectionInputData,
+				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+				itemIndex: itemIndex || 0,
+				node,
+				runExecutionData,
+				runIndex,
+				workflow,
+			} as ICredentialsExpressionResolveValues;
+		}
+
+		const nodeCredentials = node.credentials
+			? node.credentials[type]
+			: ({} as INodeCredentialsDetails);
+
+		// TODO: solve using credentials via expression
+		// if (name.charAt(0) === '=') {
+		// 	// If the credential name is an expression resolve it
+		// 	const additionalKeys = getAdditionalKeys(additionalData, mode);
+		// 	name = workflow.expression.getParameterValue(
+		// 		name,
+		// 		runExecutionData || null,
+		// 		runIndex || 0,
+		// 		itemIndex || 0,
+		// 		node.name,
+		// 		connectionInputData || [],
+		// 		mode,
+		// 		additionalKeys,
+		// 	) as string;
+		// }
+
+		const decryptedDataObject = await additionalData.credentialsHelper.getDecrypted(
+			additionalData,
+			nodeCredentials,
+			type,
+			mode,
+			executeData,
+			false,
+			expressionResolveValues,
+		);
+
+		return decryptedDataObject as T;
+	}
+
+	protected get additionalKeys() {
+		return getAdditionalKeys(this.additionalData, this.mode, this.runExecutionData);
+	}
+
+	/** Returns the requested resolved (all expressions replaced) node parameters. */
+	getNodeParameter(
+		parameterName: string,
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		fallbackValue?: any,
+		options?: IGetNodeParameterOptions,
+	): NodeParameterValueType | object {
+		const itemIndex = 0;
+		return this._getNodeParameter(parameterName, itemIndex, fallbackValue, options);
+	}
+
+	protected _getNodeParameter(
+		parameterName: string,
+		itemIndex: number,
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		fallbackValue?: any,
+		options?: IGetNodeParameterOptions,
+	): NodeParameterValueType | object {
+		const { workflow, node, mode, runExecutionData, runIndex, connectionInputData, executeData } =
+			this;
+
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		const value = get(node.parameters, parameterName, fallbackValue);
+
+		if (value === undefined) {
+			throw new ApplicationError('Could not get parameter', { extra: { parameterName } });
+		}
+
+		if (options?.rawExpressions) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+			return value;
+		}
+
+		const { additionalKeys } = this;
+
+		let returnData;
+
+		try {
+			returnData = workflow.expression.getParameterValue(
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+				value,
+				runExecutionData,
+				runIndex,
+				itemIndex,
+				node.name,
+				connectionInputData,
+				mode,
+				additionalKeys,
+				executeData,
+				false,
+				{},
+				options?.contextNode?.name,
+			);
+			cleanupParameterData(returnData);
+		} catch (e) {
+			if (
+				e instanceof ExpressionError &&
+				node.continueOnFail &&
+				node.type === 'n8n-nodes-base.set'
+			) {
+				// https://linear.app/n8n/issue/PAY-684
+				returnData = [{ name: undefined, value: undefined }];
+			} else {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				if (e.context) e.context.parameter = parameterName;
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+				e.cause = value;
+				throw e;
+			}
+		}
+
+		// This is outside the try/catch because it throws errors with proper messages
+		if (options?.extractValue) {
+			returnData = extractValue(returnData, parameterName, node, nodeType, itemIndex);
+		}
+
+		// Make sure parameter value is the type specified in the ensureType option, if needed convert it
+		if (options?.ensureType) {
+			returnData = ensureType(options.ensureType, returnData, parameterName, {
+				itemIndex,
+				runIndex,
+				nodeCause: node.name,
+			});
+		}
+
+		// Validate parameter value if it has a schema defined(RMC) or validateType defined
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		returnData = validateValueAgainstSchema(
+			node,
+			nodeType,
+			returnData,
+			parameterName,
+			runIndex,
+			itemIndex,
+		);
+
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return returnData;
+	}
+
+	evaluateExpression(expression: string, itemIndex: number = 0) {
+		return this.workflow.expression.resolveSimpleParameterValue(
+			`=${expression}`,
+			{},
+			this.runExecutionData,
+			this.runIndex,
+			itemIndex,
+			this.node.name,
+			this.connectionInputData,
+			this.mode,
+			this.additionalKeys,
+			this.executeData,
+		);
+	}
+
 	async prepareOutputData(outputData: INodeExecutionData[]) {
 		return [outputData];
 	}
diff --git a/packages/core/src/node-execution-context/poll-context.ts b/packages/core/src/node-execution-context/poll-context.ts
index e3c0dd0cc8..ca90a243f4 100644
--- a/packages/core/src/node-execution-context/poll-context.ts
+++ b/packages/core/src/node-execution-context/poll-context.ts
@@ -1,12 +1,8 @@
 import type {
 	ICredentialDataDecryptedObject,
-	IGetNodeParameterOptions,
 	INode,
-	INodeExecutionData,
 	IPollFunctions,
-	IRunExecutionData,
 	IWorkflowExecuteAdditionalData,
-	NodeParameterValueType,
 	Workflow,
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
@@ -15,10 +11,7 @@ import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
-	getAdditionalKeys,
 	getBinaryHelperFunctions,
-	getCredentials,
-	getNodeParameter,
 	getRequestHelperFunctions,
 	getSchedulingFunctions,
 	returnJsonArray,
@@ -62,33 +55,6 @@ export class PollContext extends NodeExecutionContext implements IPollFunctions
 	}
 
 	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
-		return await getCredentials<T>(this.workflow, this.node, type, this.additionalData, this.mode);
-	}
-
-	getNodeParameter(
-		parameterName: string,
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		fallbackValue?: any,
-		options?: IGetNodeParameterOptions,
-	): NodeParameterValueType | object {
-		const runExecutionData: IRunExecutionData | null = null;
-		const itemIndex = 0;
-		const runIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
-
-		return getNodeParameter(
-			this.workflow,
-			runExecutionData,
-			runIndex,
-			connectionInputData,
-			this.node,
-			parameterName,
-			itemIndex,
-			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, runExecutionData),
-			undefined,
-			fallbackValue,
-			options,
-		);
+		return await this._getCredentials<T>(type);
 	}
 }
diff --git a/packages/core/src/node-execution-context/supply-data-context.ts b/packages/core/src/node-execution-context/supply-data-context.ts
new file mode 100644
index 0000000000..bab9d11108
--- /dev/null
+++ b/packages/core/src/node-execution-context/supply-data-context.ts
@@ -0,0 +1,206 @@
+import type {
+	CloseFunction,
+	IExecuteData,
+	IGetNodeParameterOptions,
+	INode,
+	INodeExecutionData,
+	IRunExecutionData,
+	ISupplyDataFunctions,
+	ITaskDataConnections,
+	ITaskMetadata,
+	IWorkflowExecuteAdditionalData,
+	NodeConnectionType,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import {
+	assertBinaryData,
+	constructExecutionMetaData,
+	copyInputItems,
+	getBinaryDataBuffer,
+	getBinaryHelperFunctions,
+	getCheckProcessedHelperFunctions,
+	getFileSystemHelperFunctions,
+	getRequestHelperFunctions,
+	getSSHTunnelFunctions,
+	normalizeItems,
+	returnJsonArray,
+	getInputConnectionData,
+	addExecutionDataFunctions,
+} from '@/NodeExecuteFunctions';
+
+import { BaseExecuteContext } from './base-execute-context';
+
+export class SupplyDataContext extends BaseExecuteContext implements ISupplyDataFunctions {
+	readonly helpers: ISupplyDataFunctions['helpers'];
+
+	readonly getNodeParameter: ISupplyDataFunctions['getNodeParameter'];
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		runExecutionData: IRunExecutionData,
+		runIndex: number,
+		connectionInputData: INodeExecutionData[],
+		inputData: ITaskDataConnections,
+		executeData: IExecuteData,
+		private readonly closeFunctions: CloseFunction[],
+		abortSignal?: AbortSignal,
+	) {
+		super(
+			workflow,
+			node,
+			additionalData,
+			mode,
+			runExecutionData,
+			runIndex,
+			connectionInputData,
+			inputData,
+			executeData,
+			abortSignal,
+		);
+
+		this.helpers = {
+			createDeferredPromise,
+			copyInputItems,
+			...getRequestHelperFunctions(
+				workflow,
+				node,
+				additionalData,
+				runExecutionData,
+				connectionInputData,
+			),
+			...getSSHTunnelFunctions(),
+			...getFileSystemHelperFunctions(node),
+			...getBinaryHelperFunctions(additionalData, workflow.id),
+			...getCheckProcessedHelperFunctions(workflow, node),
+			assertBinaryData: (itemIndex, propertyName) =>
+				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
+			getBinaryDataBuffer: async (itemIndex, propertyName) =>
+				await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
+
+			returnJsonArray,
+			normalizeItems,
+			constructExecutionMetaData,
+		};
+
+		this.getNodeParameter = ((
+			parameterName: string,
+			itemIndex: number,
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			fallbackValue?: any,
+			options?: IGetNodeParameterOptions,
+		) =>
+			this._getNodeParameter(
+				parameterName,
+				itemIndex,
+				fallbackValue,
+				options,
+			)) as ISupplyDataFunctions['getNodeParameter'];
+	}
+
+	async getInputConnectionData(inputName: NodeConnectionType, itemIndex: number): Promise<unknown> {
+		return await getInputConnectionData.call(
+			this,
+			this.workflow,
+			this.runExecutionData,
+			this.runIndex,
+			this.connectionInputData,
+			this.inputData,
+			this.additionalData,
+			this.executeData,
+			this.mode,
+			this.closeFunctions,
+			inputName,
+			itemIndex,
+			this.abortSignal,
+		);
+	}
+
+	getInputData(inputIndex = 0, inputName = 'main') {
+		if (!this.inputData.hasOwnProperty(inputName)) {
+			// Return empty array because else it would throw error when nothing is connected to input
+			return [];
+		}
+
+		// TODO: Check if nodeType has input with that index defined
+		if (this.inputData[inputName].length < inputIndex) {
+			throw new ApplicationError('Could not get input with given index', {
+				extra: { inputIndex, inputName },
+			});
+		}
+
+		if (this.inputData[inputName][inputIndex] === null) {
+			throw new ApplicationError('Value of input was not set', {
+				extra: { inputIndex, inputName },
+			});
+		}
+
+		return this.inputData[inputName][inputIndex];
+	}
+
+	addInputData(
+		connectionType: NodeConnectionType,
+		data: INodeExecutionData[][],
+	): { index: number } {
+		const nodeName = this.node.name;
+		let currentNodeRunIndex = 0;
+		if (this.runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
+			currentNodeRunIndex = this.runExecutionData.resultData.runData[nodeName].length;
+		}
+
+		addExecutionDataFunctions(
+			'input',
+			nodeName,
+			data,
+			this.runExecutionData,
+			connectionType,
+			this.additionalData,
+			nodeName,
+			this.runIndex,
+			currentNodeRunIndex,
+		).catch((error) => {
+			this.logger.warn(
+				`There was a problem logging input data of node "${nodeName}": ${
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+					error.message
+				}`,
+			);
+		});
+
+		return { index: currentNodeRunIndex };
+	}
+
+	addOutputData(
+		connectionType: NodeConnectionType,
+		currentNodeRunIndex: number,
+		data: INodeExecutionData[][],
+		metadata?: ITaskMetadata,
+	): void {
+		const nodeName = this.node.name;
+		addExecutionDataFunctions(
+			'output',
+			nodeName,
+			data,
+			this.runExecutionData,
+			connectionType,
+			this.additionalData,
+			nodeName,
+			this.runIndex,
+			currentNodeRunIndex,
+			metadata,
+		).catch((error) => {
+			this.logger.warn(
+				`There was a problem logging output data of node "${nodeName}": ${
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+					error.message
+				}`,
+			);
+		});
+	}
+}
diff --git a/packages/core/src/node-execution-context/trigger-context.ts b/packages/core/src/node-execution-context/trigger-context.ts
index 5ae6ce47df..88c8d91432 100644
--- a/packages/core/src/node-execution-context/trigger-context.ts
+++ b/packages/core/src/node-execution-context/trigger-context.ts
@@ -1,12 +1,8 @@
 import type {
 	ICredentialDataDecryptedObject,
-	IGetNodeParameterOptions,
 	INode,
-	INodeExecutionData,
-	IRunExecutionData,
 	ITriggerFunctions,
 	IWorkflowExecuteAdditionalData,
-	NodeParameterValueType,
 	Workflow,
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
@@ -15,10 +11,7 @@ import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
-	getAdditionalKeys,
 	getBinaryHelperFunctions,
-	getCredentials,
-	getNodeParameter,
 	getRequestHelperFunctions,
 	getSchedulingFunctions,
 	getSSHTunnelFunctions,
@@ -64,33 +57,6 @@ export class TriggerContext extends NodeExecutionContext implements ITriggerFunc
 	}
 
 	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
-		return await getCredentials<T>(this.workflow, this.node, type, this.additionalData, this.mode);
-	}
-
-	getNodeParameter(
-		parameterName: string,
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		fallbackValue?: any,
-		options?: IGetNodeParameterOptions,
-	): NodeParameterValueType | object {
-		const runExecutionData: IRunExecutionData | null = null;
-		const itemIndex = 0;
-		const runIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
-
-		return getNodeParameter(
-			this.workflow,
-			runExecutionData,
-			runIndex,
-			connectionInputData,
-			this.node,
-			parameterName,
-			itemIndex,
-			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, runExecutionData),
-			undefined,
-			fallbackValue,
-			options,
-		);
+		return await this._getCredentials<T>(type);
 	}
 }
diff --git a/packages/core/src/node-execution-context/utils.ts b/packages/core/src/node-execution-context/utils.ts
new file mode 100644
index 0000000000..a09147d543
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils.ts
@@ -0,0 +1,423 @@
+import { DateTime } from 'luxon';
+import type {
+	EnsureTypeOptions,
+	FieldType,
+	IDataObject,
+	INode,
+	INodeParameters,
+	INodeProperties,
+	INodePropertyCollection,
+	INodePropertyOptions,
+	INodeType,
+	IRunExecutionData,
+	IWorkflowDataProxyAdditionalKeys,
+	IWorkflowExecuteAdditionalData,
+	NodeParameterValueType,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import {
+	ExpressionError,
+	isResourceMapperValue,
+	LoggerProxy,
+	NodeHelpers,
+	validateFieldType,
+} from 'n8n-workflow';
+
+import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/Constants';
+import {
+	setWorkflowExecutionMetadata,
+	setAllWorkflowExecutionMetadata,
+	getWorkflowExecutionMetadata,
+	getAllWorkflowExecutionMetadata,
+} from '@/ExecutionMetadata';
+import type { ExtendedValidationResult } from '@/Interfaces';
+import { getSecretsProxy } from '@/Secrets';
+
+/**
+ * Clean up parameter data to make sure that only valid data gets returned
+ * INFO: Currently only converts Luxon Dates as we know for sure it will not be breaking
+ */
+export function cleanupParameterData(inputData: NodeParameterValueType): void {
+	if (typeof inputData !== 'object' || inputData === null) {
+		return;
+	}
+
+	if (Array.isArray(inputData)) {
+		inputData.forEach((value) => cleanupParameterData(value as NodeParameterValueType));
+		return;
+	}
+
+	if (typeof inputData === 'object') {
+		Object.keys(inputData).forEach((key) => {
+			const value = (inputData as INodeParameters)[key];
+			if (typeof value === 'object') {
+				if (DateTime.isDateTime(value)) {
+					// Is a special luxon date so convert to string
+					(inputData as INodeParameters)[key] = value.toString();
+				} else {
+					cleanupParameterData(value);
+				}
+			}
+		});
+	}
+}
+
+const validateResourceMapperValue = (
+	parameterName: string,
+	paramValues: { [key: string]: unknown },
+	node: INode,
+	skipRequiredCheck = false,
+): ExtendedValidationResult => {
+	const result: ExtendedValidationResult = { valid: true, newValue: paramValues };
+	const paramNameParts = parameterName.split('.');
+	if (paramNameParts.length !== 2) {
+		return result;
+	}
+	const resourceMapperParamName = paramNameParts[0];
+	const resourceMapperField = node.parameters[resourceMapperParamName];
+	if (!resourceMapperField || !isResourceMapperValue(resourceMapperField)) {
+		return result;
+	}
+	const schema = resourceMapperField.schema;
+	const paramValueNames = Object.keys(paramValues);
+	for (let i = 0; i < paramValueNames.length; i++) {
+		const key = paramValueNames[i];
+		const resolvedValue = paramValues[key];
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+		const schemaEntry = schema.find((s) => s.id === key);
+
+		if (
+			!skipRequiredCheck &&
+			schemaEntry?.required === true &&
+			schemaEntry.type !== 'boolean' &&
+			!resolvedValue
+		) {
+			return {
+				valid: false,
+				errorMessage: `The value "${String(key)}" is required but not set`,
+				fieldName: key,
+			};
+		}
+
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		if (schemaEntry?.type) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+			const validationResult = validateFieldType(key, resolvedValue, schemaEntry.type, {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+				valueOptions: schemaEntry.options,
+			});
+			if (!validationResult.valid) {
+				return { ...validationResult, fieldName: key };
+			} else {
+				// If it's valid, set the casted value
+				paramValues[key] = validationResult.newValue;
+			}
+		}
+	}
+	return result;
+};
+
+const validateCollection = (
+	node: INode,
+	runIndex: number,
+	itemIndex: number,
+	propertyDescription: INodeProperties,
+	parameterPath: string[],
+	validationResult: ExtendedValidationResult,
+): ExtendedValidationResult => {
+	let nestedDescriptions: INodeProperties[] | undefined;
+
+	if (propertyDescription.type === 'fixedCollection') {
+		nestedDescriptions = (propertyDescription.options as INodePropertyCollection[]).find(
+			(entry) => entry.name === parameterPath[1],
+		)?.values;
+	}
+
+	if (propertyDescription.type === 'collection') {
+		nestedDescriptions = propertyDescription.options as INodeProperties[];
+	}
+
+	if (!nestedDescriptions) {
+		return validationResult;
+	}
+
+	const validationMap: {
+		[key: string]: { type: FieldType; displayName: string; options?: INodePropertyOptions[] };
+	} = {};
+
+	for (const prop of nestedDescriptions) {
+		if (!prop.validateType || prop.ignoreValidationDuringExecution) continue;
+
+		validationMap[prop.name] = {
+			type: prop.validateType,
+			displayName: prop.displayName,
+			options:
+				prop.validateType === 'options' ? (prop.options as INodePropertyOptions[]) : undefined,
+		};
+	}
+
+	if (!Object.keys(validationMap).length) {
+		return validationResult;
+	}
+
+	if (validationResult.valid) {
+		for (const value of Array.isArray(validationResult.newValue)
+			? (validationResult.newValue as IDataObject[])
+			: [validationResult.newValue as IDataObject]) {
+			for (const key of Object.keys(value)) {
+				if (!validationMap[key]) continue;
+
+				const fieldValidationResult = validateFieldType(key, value[key], validationMap[key].type, {
+					valueOptions: validationMap[key].options,
+				});
+
+				if (!fieldValidationResult.valid) {
+					throw new ExpressionError(
+						`Invalid input for field '${validationMap[key].displayName}' inside '${propertyDescription.displayName}' in [item ${itemIndex}]`,
+						{
+							description: fieldValidationResult.errorMessage,
+							runIndex,
+							itemIndex,
+							nodeCause: node.name,
+						},
+					);
+				}
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				value[key] = fieldValidationResult.newValue;
+			}
+		}
+	}
+
+	return validationResult;
+};
+
+export const validateValueAgainstSchema = (
+	node: INode,
+	nodeType: INodeType,
+	parameterValue: string | number | boolean | object | null | undefined,
+	parameterName: string,
+	runIndex: number,
+	itemIndex: number,
+) => {
+	const parameterPath = parameterName.split('.');
+
+	const propertyDescription = nodeType.description.properties.find(
+		(prop) =>
+			parameterPath[0] === prop.name && NodeHelpers.displayParameter(node.parameters, prop, node),
+	);
+
+	if (!propertyDescription) {
+		return parameterValue;
+	}
+
+	let validationResult: ExtendedValidationResult = { valid: true, newValue: parameterValue };
+
+	if (
+		parameterPath.length === 1 &&
+		propertyDescription.validateType &&
+		!propertyDescription.ignoreValidationDuringExecution
+	) {
+		validationResult = validateFieldType(
+			parameterName,
+			parameterValue,
+			propertyDescription.validateType,
+		);
+	} else if (
+		propertyDescription.type === 'resourceMapper' &&
+		parameterPath[1] === 'value' &&
+		typeof parameterValue === 'object'
+	) {
+		validationResult = validateResourceMapperValue(
+			parameterName,
+			parameterValue as { [key: string]: unknown },
+			node,
+			propertyDescription.typeOptions?.resourceMapper?.mode !== 'add',
+		);
+	} else if (['fixedCollection', 'collection'].includes(propertyDescription.type)) {
+		validationResult = validateCollection(
+			node,
+			runIndex,
+			itemIndex,
+			propertyDescription,
+			parameterPath,
+			validationResult,
+		);
+	}
+
+	if (!validationResult.valid) {
+		throw new ExpressionError(
+			`Invalid input for '${
+				validationResult.fieldName
+					? String(validationResult.fieldName)
+					: propertyDescription.displayName
+			}' [item ${itemIndex}]`,
+			{
+				description: validationResult.errorMessage,
+				runIndex,
+				itemIndex,
+				nodeCause: node.name,
+			},
+		);
+	}
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+	return validationResult.newValue;
+};
+
+export function ensureType(
+	toType: EnsureTypeOptions,
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	parameterValue: any,
+	parameterName: string,
+	errorOptions?: { itemIndex?: number; runIndex?: number; nodeCause?: string },
+): string | number | boolean | object {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+	let returnData = parameterValue;
+
+	if (returnData === null) {
+		throw new ExpressionError(`Parameter '${parameterName}' must not be null`, errorOptions);
+	}
+
+	if (returnData === undefined) {
+		throw new ExpressionError(
+			`Parameter '${parameterName}' could not be 'undefined'`,
+			errorOptions,
+		);
+	}
+
+	if (['object', 'array', 'json'].includes(toType)) {
+		if (typeof returnData !== 'object') {
+			// if value is not an object and is string try to parse it, else throw an error
+			if (typeof returnData === 'string' && returnData.length) {
+				try {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+					const parsedValue = JSON.parse(returnData);
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+					returnData = parsedValue;
+				} catch (error) {
+					throw new ExpressionError(`Parameter '${parameterName}' could not be parsed`, {
+						...errorOptions,
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+						description: error.message,
+					});
+				}
+			} else {
+				throw new ExpressionError(
+					`Parameter '${parameterName}' must be an ${toType}, but we got '${String(parameterValue)}'`,
+					errorOptions,
+				);
+			}
+		} else if (toType === 'json') {
+			// value is an object, make sure it is valid JSON
+			try {
+				JSON.stringify(returnData);
+			} catch (error) {
+				throw new ExpressionError(`Parameter '${parameterName}' is not valid JSON`, {
+					...errorOptions,
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+					description: error.message,
+				});
+			}
+		}
+
+		if (toType === 'array' && !Array.isArray(returnData)) {
+			// value is not an array, but has to be
+			throw new ExpressionError(
+				`Parameter '${parameterName}' must be an array, but we got object`,
+				errorOptions,
+			);
+		}
+	}
+
+	try {
+		if (toType === 'string') {
+			if (typeof returnData === 'object') {
+				returnData = JSON.stringify(returnData);
+			} else {
+				returnData = String(returnData);
+			}
+		}
+
+		if (toType === 'number') {
+			returnData = Number(returnData);
+			if (Number.isNaN(returnData)) {
+				throw new ExpressionError(
+					`Parameter '${parameterName}' must be a number, but we got '${parameterValue}'`,
+					errorOptions,
+				);
+			}
+		}
+
+		if (toType === 'boolean') {
+			returnData = Boolean(returnData);
+		}
+	} catch (error) {
+		if (error instanceof ExpressionError) throw error;
+
+		throw new ExpressionError(`Parameter '${parameterName}' could not be converted to ${toType}`, {
+			...errorOptions,
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+			description: error.message,
+		});
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+	return returnData;
+}
+
+/** Returns the additional keys for Expressions and Function-Nodes */
+export function getAdditionalKeys(
+	additionalData: IWorkflowExecuteAdditionalData,
+	mode: WorkflowExecuteMode,
+	runExecutionData: IRunExecutionData | null,
+	options?: { secretsEnabled?: boolean },
+): IWorkflowDataProxyAdditionalKeys {
+	const executionId = additionalData.executionId ?? PLACEHOLDER_EMPTY_EXECUTION_ID;
+	const resumeUrl = `${additionalData.webhookWaitingBaseUrl}/${executionId}`;
+	const resumeFormUrl = `${additionalData.formWaitingBaseUrl}/${executionId}`;
+	return {
+		$execution: {
+			id: executionId,
+			mode: mode === 'manual' ? 'test' : 'production',
+			resumeUrl,
+			resumeFormUrl,
+			customData: runExecutionData
+				? {
+						set(key: string, value: string): void {
+							try {
+								setWorkflowExecutionMetadata(runExecutionData, key, value);
+							} catch (e) {
+								if (mode === 'manual') {
+									throw e;
+								}
+								// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+								LoggerProxy.debug(e.message);
+							}
+						},
+						setAll(obj: Record<string, string>): void {
+							try {
+								setAllWorkflowExecutionMetadata(runExecutionData, obj);
+							} catch (e) {
+								if (mode === 'manual') {
+									throw e;
+								}
+								// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+								LoggerProxy.debug(e.message);
+							}
+						},
+						get(key: string): string {
+							return getWorkflowExecutionMetadata(runExecutionData, key);
+						},
+						getAll(): Record<string, string> {
+							return getAllWorkflowExecutionMetadata(runExecutionData);
+						},
+					}
+				: undefined,
+		},
+		$vars: additionalData.variables,
+		$secrets: options?.secretsEnabled ? getSecretsProxy(additionalData) : undefined,
+
+		// deprecated
+		$executionId: executionId,
+		$resumeWebhookUrl: resumeUrl,
+	};
+}
diff --git a/packages/core/src/node-execution-context/webhook-context.ts b/packages/core/src/node-execution-context/webhook-context.ts
index 4d3eef53e2..e1dae9c1de 100644
--- a/packages/core/src/node-execution-context/webhook-context.ts
+++ b/packages/core/src/node-execution-context/webhook-context.ts
@@ -4,7 +4,6 @@ import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteData,
-	IGetNodeParameterOptions,
 	INode,
 	INodeExecutionData,
 	IRunExecutionData,
@@ -13,7 +12,6 @@ import type {
 	IWebhookFunctions,
 	IWorkflowExecuteAdditionalData,
 	NodeConnectionType,
-	NodeParameterValueType,
 	WebhookType,
 	Workflow,
 	WorkflowExecuteMode,
@@ -23,11 +21,8 @@ import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
 // eslint-disable-next-line import/no-cycle
 import {
 	copyBinaryFile,
-	getAdditionalKeys,
 	getBinaryHelperFunctions,
-	getCredentials,
 	getInputConnectionData,
-	getNodeParameter,
 	getNodeWebhookUrl,
 	getRequestHelperFunctions,
 	returnJsonArray,
@@ -47,9 +42,28 @@ export class WebhookContext extends NodeExecutionContext implements IWebhookFunc
 		mode: WorkflowExecuteMode,
 		private readonly webhookData: IWebhookData,
 		private readonly closeFunctions: CloseFunction[],
-		private readonly runExecutionData: IRunExecutionData | null,
+		runExecutionData: IRunExecutionData | null,
 	) {
-		super(workflow, node, additionalData, mode);
+		let connectionInputData: INodeExecutionData[] = [];
+		let executionData: IExecuteData | undefined;
+
+		if (runExecutionData?.executionData !== undefined) {
+			executionData = runExecutionData.executionData.nodeExecutionStack[0];
+			if (executionData !== undefined) {
+				connectionInputData = executionData.data.main[0]!;
+			}
+		}
+
+		super(
+			workflow,
+			node,
+			additionalData,
+			mode,
+			runExecutionData,
+			0,
+			connectionInputData,
+			executionData,
+		);
 
 		this.helpers = {
 			createDeferredPromise,
@@ -71,7 +85,7 @@ export class WebhookContext extends NodeExecutionContext implements IWebhookFunc
 	}
 
 	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
-		return await getCredentials<T>(this.workflow, this.node, type, this.additionalData, this.mode);
+		return await this._getCredentials<T>(type);
 	}
 
 	getBodyData() {
@@ -116,7 +130,7 @@ export class WebhookContext extends NodeExecutionContext implements IWebhookFunc
 			this.node,
 			this.additionalData,
 			this.mode,
-			getAdditionalKeys(this.additionalData, this.mode, null),
+			this.additionalKeys,
 		);
 	}
 
@@ -144,13 +158,12 @@ export class WebhookContext extends NodeExecutionContext implements IWebhookFunc
 			node: this.node,
 			source: null,
 		};
-		const runIndex = 0;
 
 		return await getInputConnectionData.call(
 			this,
 			this.workflow,
 			runExecutionData,
-			runIndex,
+			this.runIndex,
 			connectionInputData,
 			{} as ITaskDataConnections,
 			this.additionalData,
@@ -161,73 +174,4 @@ export class WebhookContext extends NodeExecutionContext implements IWebhookFunc
 			itemIndex,
 		);
 	}
-
-	evaluateExpression(expression: string, evaluateItemIndex?: number) {
-		const itemIndex = evaluateItemIndex ?? 0;
-		const runIndex = 0;
-
-		let connectionInputData: INodeExecutionData[] = [];
-		let executionData: IExecuteData | undefined;
-
-		if (this.runExecutionData?.executionData !== undefined) {
-			executionData = this.runExecutionData.executionData.nodeExecutionStack[0];
-
-			if (executionData !== undefined) {
-				connectionInputData = executionData.data.main[0]!;
-			}
-		}
-
-		const additionalKeys = getAdditionalKeys(this.additionalData, this.mode, this.runExecutionData);
-
-		return this.workflow.expression.resolveSimpleParameterValue(
-			`=${expression}`,
-			{},
-			this.runExecutionData,
-			runIndex,
-			itemIndex,
-			this.node.name,
-			connectionInputData,
-			this.mode,
-			additionalKeys,
-			executionData,
-		);
-	}
-
-	getNodeParameter(
-		parameterName: string,
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		fallbackValue?: any,
-		options?: IGetNodeParameterOptions,
-	): NodeParameterValueType | object {
-		const itemIndex = 0;
-		const runIndex = 0;
-
-		let connectionInputData: INodeExecutionData[] = [];
-		let executionData: IExecuteData | undefined;
-
-		if (this.runExecutionData?.executionData !== undefined) {
-			executionData = this.runExecutionData.executionData.nodeExecutionStack[0];
-
-			if (executionData !== undefined) {
-				connectionInputData = executionData.data.main[0]!;
-			}
-		}
-
-		const additionalKeys = getAdditionalKeys(this.additionalData, this.mode, this.runExecutionData);
-
-		return getNodeParameter(
-			this.workflow,
-			this.runExecutionData,
-			runIndex,
-			connectionInputData,
-			this.node,
-			parameterName,
-			itemIndex,
-			this.mode,
-			additionalKeys,
-			executionData,
-			fallbackValue,
-			options,
-		);
-	}
 }
diff --git a/packages/core/test/NodeExecuteFunctions.test.ts b/packages/core/test/NodeExecuteFunctions.test.ts
index 421b7cd247..f754abec58 100644
--- a/packages/core/test/NodeExecuteFunctions.test.ts
+++ b/packages/core/test/NodeExecuteFunctions.test.ts
@@ -1,9 +1,7 @@
 import { mkdtempSync, readFileSync } from 'fs';
-import type { IncomingMessage } from 'http';
+import { 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,
@@ -12,25 +10,25 @@ import type {
 	IRequestOptions,
 	ITaskDataConnections,
 	IWorkflowExecuteAdditionalData,
-	NodeParameterValue,
 	Workflow,
 	WorkflowHooks,
 } from 'n8n-workflow';
-import { ExpressionError } from 'n8n-workflow';
 import nock from 'nock';
 import { tmpdir } from 'os';
 import { join } from 'path';
+import { Readable } from 'stream';
 import type { SecureContextOptions } from 'tls';
 import Container from 'typedi';
 
 import { BinaryDataService } from '@/BinaryData/BinaryData.service';
 import { InstanceSettings } from '@/InstanceSettings';
 import {
-	cleanupParameterData,
+	binaryToString,
 	copyInputItems,
-	ensureType,
 	getBinaryDataBuffer,
 	isFilePathBlocked,
+	parseContentDisposition,
+	parseContentType,
 	parseIncomingMessage,
 	parseRequestObject,
 	proxyRequestToAxios,
@@ -154,6 +152,152 @@ describe('NodeExecuteFunctions', () => {
 		});
 	});
 
+	describe('parseContentType', () => {
+		const testCases = [
+			{
+				input: 'text/plain',
+				expected: {
+					type: 'text/plain',
+					parameters: {
+						charset: 'utf-8',
+					},
+				},
+				description: 'should parse basic content type',
+			},
+			{
+				input: 'TEXT/PLAIN',
+				expected: {
+					type: 'text/plain',
+					parameters: {
+						charset: 'utf-8',
+					},
+				},
+				description: 'should convert type to lowercase',
+			},
+			{
+				input: 'text/html; charset=iso-8859-1',
+				expected: {
+					type: 'text/html',
+					parameters: {
+						charset: 'iso-8859-1',
+					},
+				},
+				description: 'should parse content type with charset',
+			},
+			{
+				input: 'application/json; charset=utf-8; boundary=---123',
+				expected: {
+					type: 'application/json',
+					parameters: {
+						charset: 'utf-8',
+						boundary: '---123',
+					},
+				},
+				description: 'should parse content type with multiple parameters',
+			},
+			{
+				input: 'text/plain; charset="utf-8"; filename="test.txt"',
+				expected: {
+					type: 'text/plain',
+					parameters: {
+						charset: 'utf-8',
+						filename: 'test.txt',
+					},
+				},
+				description: 'should handle quoted parameter values',
+			},
+			{
+				input: 'text/plain; filename=%22test%20file.txt%22',
+				expected: {
+					type: 'text/plain',
+					parameters: {
+						charset: 'utf-8',
+						filename: 'test file.txt',
+					},
+				},
+				description: 'should handle encoded parameter values',
+			},
+			{
+				input: undefined,
+				expected: null,
+				description: 'should return null for undefined input',
+			},
+			{
+				input: '',
+				expected: null,
+				description: 'should return null for empty string',
+			},
+		];
+
+		test.each(testCases)('$description', ({ input, expected }) => {
+			expect(parseContentType(input)).toEqual(expected);
+		});
+	});
+
+	describe('parseContentDisposition', () => {
+		const testCases = [
+			{
+				input: 'attachment; filename="file.txt"',
+				expected: { type: 'attachment', filename: 'file.txt' },
+				description: 'should parse basic content disposition',
+			},
+			{
+				input: 'attachment; filename=file.txt',
+				expected: { type: 'attachment', filename: 'file.txt' },
+				description: 'should parse filename without quotes',
+			},
+			{
+				input: 'inline; filename="image.jpg"',
+				expected: { type: 'inline', filename: 'image.jpg' },
+				description: 'should parse inline disposition',
+			},
+			{
+				input: 'attachment; filename="my file.pdf"',
+				expected: { type: 'attachment', filename: 'my file.pdf' },
+				description: 'should parse filename with spaces',
+			},
+			{
+				input: "attachment; filename*=UTF-8''my%20file.txt",
+				expected: { type: 'attachment', filename: 'my file.txt' },
+				description: 'should parse filename* parameter (RFC 5987)',
+			},
+			{
+				input: 'filename="test.txt"',
+				expected: { type: 'attachment', filename: 'test.txt' },
+				description: 'should handle invalid syntax but with filename',
+			},
+			{
+				input: 'filename=test.txt',
+				expected: { type: 'attachment', filename: 'test.txt' },
+				description: 'should handle invalid syntax with only filename parameter',
+			},
+			{
+				input: undefined,
+				expected: null,
+				description: 'should return null for undefined input',
+			},
+			{
+				input: '',
+				expected: null,
+				description: 'should return null for empty string',
+			},
+			{
+				input: 'attachment; filename="%F0%9F%98%80.txt"',
+				expected: { type: 'attachment', filename: '😀.txt' },
+				description: 'should handle encoded filenames',
+			},
+			{
+				input: 'attachment; size=123; filename="test.txt"; creation-date="Thu, 1 Jan 2020"',
+				expected: { type: 'attachment', filename: 'test.txt' },
+				description: 'should handle multiple parameters',
+			},
+		];
+
+		test.each(testCases)('$description', ({ input, expected }) => {
+			expect(parseContentDisposition(input)).toEqual(expected);
+		});
+	});
+
 	describe('parseIncomingMessage', () => {
 		it('parses valid content-type header', () => {
 			const message = mock<IncomingMessage>({
@@ -174,6 +318,20 @@ describe('NodeExecuteFunctions', () => {
 			parseIncomingMessage(message);
 
 			expect(message.contentType).toEqual('application/json');
+			expect(message.encoding).toEqual('utf-8');
+		});
+
+		it('parses valid content-type header with encoding wrapped in quotes', () => {
+			const message = mock<IncomingMessage>({
+				headers: {
+					'content-type': 'application/json; charset="utf-8"',
+					'content-disposition': undefined,
+				},
+			});
+			parseIncomingMessage(message);
+
+			expect(message.contentType).toEqual('application/json');
+			expect(message.encoding).toEqual('utf-8');
 		});
 
 		it('parses valid content-disposition header with filename*', () => {
@@ -470,39 +628,6 @@ describe('NodeExecuteFunctions', () => {
 		});
 	});
 
-	describe('cleanupParameterData', () => {
-		it('should stringify Luxon dates in-place', () => {
-			const input = { x: 1, y: DateTime.now() as unknown as NodeParameterValue };
-			expect(typeof input.y).toBe('object');
-			cleanupParameterData(input);
-			expect(typeof input.y).toBe('string');
-		});
-
-		it('should stringify plain Luxon dates in-place', () => {
-			const input = {
-				x: 1,
-				y: toPlainObject(DateTime.now()),
-			};
-			expect(typeof input.y).toBe('object');
-			cleanupParameterData(input);
-			expect(typeof input.y).toBe('string');
-		});
-
-		it('should handle objects with nameless constructors', () => {
-			const input = { x: 1, y: { constructor: {} } as NodeParameterValue };
-			expect(typeof input.y).toBe('object');
-			cleanupParameterData(input);
-			expect(typeof input.y).toBe('object');
-		});
-
-		it('should handle objects without a constructor', () => {
-			const input = { x: 1, y: { constructor: undefined } as unknown as NodeParameterValue };
-			expect(typeof input.y).toBe('object');
-			cleanupParameterData(input);
-			expect(typeof input.y).toBe('object');
-		});
-	});
-
 	describe('copyInputItems', () => {
 		it('should pick only selected properties', () => {
 			const output = copyInputItems(
@@ -589,80 +714,98 @@ describe('NodeExecuteFunctions', () => {
 		);
 	});
 
-	describe('ensureType', () => {
-		it('throws error for null value', () => {
-			expect(() => ensureType('string', null, 'myParam')).toThrowError(
-				new ExpressionError("Parameter 'myParam' must not be null"),
-			);
+	describe('binaryToString', () => {
+		const ENCODING_SAMPLES = {
+			utf8: {
+				text: 'Hello, 世界! τεστ мир ⚡️ é à ü ñ',
+				buffer: Buffer.from([
+					0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0xe4, 0xb8, 0x96, 0xe7, 0x95, 0x8c, 0x21, 0x20,
+					0xcf, 0x84, 0xce, 0xb5, 0xcf, 0x83, 0xcf, 0x84, 0x20, 0xd0, 0xbc, 0xd0, 0xb8, 0xd1, 0x80,
+					0x20, 0xe2, 0x9a, 0xa1, 0xef, 0xb8, 0x8f, 0x20, 0xc3, 0xa9, 0x20, 0xc3, 0xa0, 0x20, 0xc3,
+					0xbc, 0x20, 0xc3, 0xb1,
+				]),
+			},
+
+			'iso-8859-15': {
+				text: 'Café € personnalité',
+				buffer: Buffer.from([
+					0x43, 0x61, 0x66, 0xe9, 0x20, 0xa4, 0x20, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x6e, 0x61,
+					0x6c, 0x69, 0x74, 0xe9,
+				]),
+			},
+
+			latin1: {
+				text: 'señor année déjà',
+				buffer: Buffer.from([
+					0x73, 0x65, 0xf1, 0x6f, 0x72, 0x20, 0x61, 0x6e, 0x6e, 0xe9, 0x65, 0x20, 0x64, 0xe9, 0x6a,
+					0xe0,
+				]),
+			},
+
+			ascii: {
+				text: 'Hello, World! 123',
+				buffer: Buffer.from([
+					0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x20, 0x31,
+					0x32, 0x33,
+				]),
+			},
+
+			'windows-1252': {
+				text: '€ Smart "quotes" • bullet',
+				buffer: Buffer.from([
+					0x80, 0x20, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x20, 0x22, 0x71, 0x75, 0x6f, 0x74, 0x65, 0x73,
+					0x22, 0x20, 0x95, 0x20, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74,
+				]),
+			},
+
+			'shift-jis': {
+				text: 'こんにちは世界',
+				buffer: Buffer.from([
+					0x82, 0xb1, 0x82, 0xf1, 0x82, 0xc9, 0x82, 0xbf, 0x82, 0xcd, 0x90, 0xa2, 0x8a, 0x45,
+				]),
+			},
+
+			big5: {
+				text: '哈囉世界',
+				buffer: Buffer.from([0xab, 0xa2, 0xc5, 0x6f, 0xa5, 0x40, 0xac, 0xc9]),
+			},
+
+			'koi8-r': {
+				text: 'Привет мир',
+				buffer: Buffer.from([0xf0, 0xd2, 0xc9, 0xd7, 0xc5, 0xd4, 0x20, 0xcd, 0xc9, 0xd2]),
+			},
+		};
+
+		describe('should handle Buffer', () => {
+			for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
+				test(`with ${encoding}`, async () => {
+					const data = await binaryToString(buffer, encoding);
+					expect(data).toBe(text);
+				});
+			}
 		});
 
-		it('throws error for undefined value', () => {
-			expect(() => ensureType('string', undefined, 'myParam')).toThrowError(
-				new ExpressionError("Parameter 'myParam' could not be 'undefined'"),
-			);
+		describe('should handle streams', () => {
+			for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
+				test(`with ${encoding}`, async () => {
+					const stream = Readable.from(buffer);
+					const data = await binaryToString(stream, encoding);
+					expect(data).toBe(text);
+				});
+			}
 		});
 
-		it('returns string value without modification', () => {
-			const value = 'hello';
-			const expectedValue = value;
-			const result = ensureType('string', value, 'myParam');
-			expect(result).toBe(expectedValue);
-		});
-
-		it('returns number value without modification', () => {
-			const value = 42;
-			const expectedValue = value;
-			const result = ensureType('number', value, 'myParam');
-			expect(result).toBe(expectedValue);
-		});
-
-		it('returns boolean value without modification', () => {
-			const value = true;
-			const expectedValue = value;
-			const result = ensureType('boolean', value, 'myParam');
-			expect(result).toBe(expectedValue);
-		});
-
-		it('converts object to string if toType is string', () => {
-			const value = { name: 'John' };
-			const expectedValue = JSON.stringify(value);
-			const result = ensureType('string', value, 'myParam');
-			expect(result).toBe(expectedValue);
-		});
-
-		it('converts string to number if toType is number', () => {
-			const value = '10';
-			const expectedValue = 10;
-			const result = ensureType('number', value, 'myParam');
-			expect(result).toBe(expectedValue);
-		});
-
-		it('throws error for invalid conversion to number', () => {
-			const value = 'invalid';
-			expect(() => ensureType('number', value, 'myParam')).toThrowError(
-				new ExpressionError("Parameter 'myParam' must be a number, but we got 'invalid'"),
-			);
-		});
-
-		it('parses valid JSON string to object if toType is object', () => {
-			const value = '{"name": "Alice"}';
-			const expectedValue = JSON.parse(value);
-			const result = ensureType('object', value, 'myParam');
-			expect(result).toEqual(expectedValue);
-		});
-
-		it('throws error for invalid JSON string to object conversion', () => {
-			const value = 'invalid_json';
-			expect(() => ensureType('object', value, 'myParam')).toThrowError(
-				new ExpressionError("Parameter 'myParam' could not be parsed"),
-			);
-		});
-
-		it('throws error for non-array value if toType is array', () => {
-			const value = { name: 'Alice' };
-			expect(() => ensureType('array', value, 'myParam')).toThrowError(
-				new ExpressionError("Parameter 'myParam' must be an array, but we got object"),
-			);
+		describe('should handle IncomingMessage', () => {
+			for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
+				test(`with ${encoding}`, async () => {
+					const response = Readable.from(buffer) as IncomingMessage;
+					response.headers = { 'content-type': `application/json;charset=${encoding}` };
+					// @ts-expect-error need this hack to fake `instanceof IncomingMessage` checks
+					response.__proto__ = IncomingMessage.prototype;
+					const data = await binaryToString(response);
+					expect(data).toBe(text);
+				});
+			}
 		});
 	});
 });
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index ab69a7574b..71be9a4891 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -1,4 +1,15 @@
-import type { IRun, WorkflowTestData } from 'n8n-workflow';
+// NOTE: Diagrams in this file have been created with https://asciiflow.com/#/
+// If you update the tests, please update the diagrams as well.
+// If you add a test, please create a new diagram.
+//
+// Map
+// 0  means the output has no run data
+// 1  means the output has run data
+// ►► denotes the node that the user wants to execute to
+// XX denotes that the node is disabled
+// PD denotes that the node has pinned data
+
+import type { IPinData, IRun, IRunData, WorkflowTestData } from 'n8n-workflow';
 import {
 	ApplicationError,
 	createDeferredPromise,
@@ -6,17 +17,20 @@ import {
 	Workflow,
 } from 'n8n-workflow';
 
+import { DirectedGraph } from '@/PartialExecutionUtils';
+import { createNodeData, toITaskData } from '@/PartialExecutionUtils/__tests__/helpers';
 import { WorkflowExecute } from '@/WorkflowExecute';
 
 import * as Helpers from './helpers';
 import { legacyWorkflowExecuteTests, v1WorkflowExecuteTests } from './helpers/constants';
 
+const nodeTypes = Helpers.NodeTypes();
+
 describe('WorkflowExecute', () => {
 	describe('v0 execution order', () => {
 		const tests: WorkflowTestData[] = legacyWorkflowExecuteTests;
 
 		const executionMode = 'manual';
-		const nodeTypes = Helpers.NodeTypes();
 
 		for (const testData of tests) {
 			test(testData.description, async () => {
@@ -206,7 +220,7 @@ describe('WorkflowExecute', () => {
 		}
 	});
 
-	describe('WorkflowExecute, NodeExecutionOutput type test', () => {
+	test('WorkflowExecute, NodeExecutionOutput type test', () => {
 		//TODO Add more tests here when execution hints are added to some node types
 		const nodeExecutionOutput = new NodeExecutionOutput(
 			[[{ json: { data: 123 } }]],
@@ -217,4 +231,98 @@ describe('WorkflowExecute', () => {
 		expect(nodeExecutionOutput[0][0].json.data).toEqual(123);
 		expect(nodeExecutionOutput.getHints()[0].message).toEqual('TEXT HINT');
 	});
+
+	describe('runPartialWorkflow2', () => {
+		//                Dirty         ►
+		// ┌───────┐1     ┌─────┐1     ┌─────┐
+		// │trigger├──────►node1├──────►node2│
+		// └───────┘      └─────┘      └─────┘
+		test("deletes dirty nodes' run data", async () => {
+			// ARRANGE
+			const waitPromise = createDeferredPromise<IRun>();
+			const nodeExecutionOrder: string[] = [];
+			const additionalData = Helpers.WorkflowExecuteAdditionalData(waitPromise, nodeExecutionOrder);
+			const workflowExecute = new WorkflowExecute(additionalData, 'manual');
+
+			const trigger = createNodeData({ name: 'trigger', type: 'n8n-nodes-base.manualTrigger' });
+			const node1 = createNodeData({ name: 'node1' });
+			const node2 = createNodeData({ name: 'node2' });
+			const workflow = new DirectedGraph()
+				.addNodes(trigger, node1, node2)
+				.addConnections({ from: trigger, to: node1 }, { from: node1, to: node2 })
+				.toWorkflow({ name: '', active: false, nodeTypes });
+			const pinData: IPinData = {};
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { name: trigger.name } }])],
+				[node1.name]: [toITaskData([{ data: { name: node1.name } }])],
+				[node2.name]: [toITaskData([{ data: { name: node2.name } }])],
+			};
+			const dirtyNodeNames = [node1.name];
+			const destinationNode = node2.name;
+
+			jest.spyOn(workflowExecute, 'processRunExecutionData').mockImplementationOnce(jest.fn());
+
+			// ACT
+			await workflowExecute.runPartialWorkflow2(
+				workflow,
+				runData,
+				pinData,
+				dirtyNodeNames,
+				destinationNode,
+			);
+
+			// ASSERT
+			const fullRunData = workflowExecute.getFullRunData(new Date());
+			expect(fullRunData.data.resultData.runData).toHaveProperty(trigger.name);
+			expect(fullRunData.data.resultData.runData).not.toHaveProperty(node1.name);
+		});
+
+		//                 XX           ►►
+		// ┌───────┐1     ┌─────┐1     ┌─────┐
+		// │trigger├──────►node1├──────►node2│
+		// └───────┘      └─────┘      └─────┘
+		test('removes disabled nodes from the workflow', async () => {
+			// ARRANGE
+			const waitPromise = createDeferredPromise<IRun>();
+			const nodeExecutionOrder: string[] = [];
+			const additionalData = Helpers.WorkflowExecuteAdditionalData(waitPromise, nodeExecutionOrder);
+			const workflowExecute = new WorkflowExecute(additionalData, 'manual');
+
+			const trigger = createNodeData({ name: 'trigger', type: 'n8n-nodes-base.manualTrigger' });
+			const node1 = createNodeData({ name: 'node1', disabled: true });
+			const node2 = createNodeData({ name: 'node2' });
+			const workflow = new DirectedGraph()
+				.addNodes(trigger, node1, node2)
+				.addConnections({ from: trigger, to: node1 }, { from: node1, to: node2 })
+				.toWorkflow({ name: '', active: false, nodeTypes });
+			const pinData: IPinData = {};
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { name: trigger.name } }])],
+				[node1.name]: [toITaskData([{ data: { name: node1.name } }])],
+				[node2.name]: [toITaskData([{ data: { name: node2.name } }])],
+			};
+			const dirtyNodeNames: string[] = [];
+			const destinationNode = node2.name;
+
+			const processRunExecutionDataSpy = jest
+				.spyOn(workflowExecute, 'processRunExecutionData')
+				.mockImplementationOnce(jest.fn());
+
+			// ACT
+			await workflowExecute.runPartialWorkflow2(
+				workflow,
+				runData,
+				pinData,
+				dirtyNodeNames,
+				destinationNode,
+			);
+
+			// ASSERT
+			expect(processRunExecutionDataSpy).toHaveBeenCalledTimes(1);
+			const nodes = Object.keys(processRunExecutionDataSpy.mock.calls[0][0].nodes);
+			expect(nodes).toContain(trigger.name);
+			expect(nodes).toContain(node2.name);
+			expect(nodes).not.toContain(node1.name);
+		});
+	});
 });
diff --git a/packages/core/test/helpers/constants.ts b/packages/core/test/helpers/constants.ts
index f3de1c667c..3043f455e9 100644
--- a/packages/core/test/helpers/constants.ts
+++ b/packages/core/test/helpers/constants.ts
@@ -7,6 +7,7 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { If } from '../../../nodes-base/dist/nodes/If/If.node';
+import { ManualTrigger } from '../../../nodes-base/dist/nodes/ManualTrigger/ManualTrigger.node';
 import { Merge } from '../../../nodes-base/dist/nodes/Merge/Merge.node';
 import { NoOp } from '../../../nodes-base/dist/nodes/NoOp/NoOp.node';
 import { Set } from '../../../nodes-base/dist/nodes/Set/Set.node';
@@ -33,6 +34,10 @@ export const predefinedNodesTypes: INodeTypeData = {
 		type: new Start(),
 		sourcePath: '',
 	},
+	'n8n-nodes-base.manualTrigger': {
+		type: new ManualTrigger(),
+		sourcePath: '',
+	},
 	'n8n-nodes-base.versionTest': {
 		sourcePath: '',
 		type: {
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 11da59ddaa..a20208feb4 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.58.0",
+  "version": "1.60.0",
   "main": "src/main.ts",
   "import": "src/main.ts",
   "scripts": {
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
index d87e41e1ed..5d3601c5c6 100644
--- a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
+++ b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
@@ -21,7 +21,7 @@ const Template: StoryFn = (args, { argTypes }) => ({
 	components: {
 		AskAssistantChat,
 	},
-	template: '<div style="width:275px; height:100%"><ask-assistant-chat v-bind="args" /></div>',
+	template: '<div style="width:275px; height:500px"><ask-assistant-chat v-bind="args" /></div>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
index aa677b037d..2b895be0bb 100644
--- a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
+++ b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
@@ -136,158 +136,167 @@ async function onCopyButtonClick(content: string, e: MouseEvent) {
 			</div>
 		</div>
 		<div :class="$style.body">
-			<div v-if="messages?.length" :class="$style.messages">
-				<div
-					v-for="(message, i) in messages"
-					:key="i"
-					:class="$style.message"
-					:data-test-id="
-						message.role === 'assistant' ? 'chat-message-assistant' : 'chat-message-user'
-					"
-				>
+			<div v-if="messages?.length || loadingMessage" :class="$style.messages">
+				<div v-if="messages?.length">
 					<div
-						v-if="
-							!isEndOfSessionEvent(message) && (i === 0 || message.role !== messages[i - 1].role)
+						v-for="(message, i) in messages"
+						:key="i"
+						:class="$style.message"
+						:data-test-id="
+							message.role === 'assistant' ? 'chat-message-assistant' : 'chat-message-user'
 						"
-						:class="{ [$style.roleName]: true, [$style.userSection]: i > 0 }"
 					>
-						<AssistantAvatar v-if="message.role === 'assistant'" />
-						<n8n-avatar
-							v-else
-							:first-name="user?.firstName"
-							:last-name="user?.lastName"
-							size="xsmall"
-						/>
+						<div
+							v-if="
+								!isEndOfSessionEvent(message) && (i === 0 || message.role !== messages[i - 1].role)
+							"
+							:class="{ [$style.roleName]: true, [$style.userSection]: i > 0 }"
+						>
+							<AssistantAvatar v-if="message.role === 'assistant'" />
+							<n8n-avatar
+								v-else
+								:first-name="user?.firstName"
+								:last-name="user?.lastName"
+								size="xsmall"
+							/>
 
-						<span v-if="message.role === 'assistant'">{{
-							t('assistantChat.aiAssistantName')
-						}}</span>
-						<span v-else>{{ t('assistantChat.you') }}</span>
-					</div>
-					<div v-if="message.type === 'block'">
-						<div :class="$style.block">
-							<div :class="$style.blockTitle">
-								{{ message.title }}
-								<BlinkingCursor
-									v-if="streaming && i === messages?.length - 1 && !message.content"
-								/>
-							</div>
-							<div :class="$style.blockBody">
-								<span
-									v-n8n-html="renderMarkdown(message.content)"
-									:class="$style['rendered-content']"
-								></span>
-								<BlinkingCursor
-									v-if="streaming && i === messages?.length - 1 && message.title && message.content"
-								/>
+							<span v-if="message.role === 'assistant'">{{
+								t('assistantChat.aiAssistantName')
+							}}</span>
+							<span v-else>{{ t('assistantChat.you') }}</span>
+						</div>
+						<div v-if="message.type === 'block'">
+							<div :class="$style.block">
+								<div :class="$style.blockTitle">
+									{{ message.title }}
+									<BlinkingCursor
+										v-if="streaming && i === messages?.length - 1 && !message.content"
+									/>
+								</div>
+								<div :class="$style.blockBody">
+									<span
+										v-n8n-html="renderMarkdown(message.content)"
+										:class="$style['rendered-content']"
+									></span>
+									<BlinkingCursor
+										v-if="
+											streaming && i === messages?.length - 1 && message.title && message.content
+										"
+									/>
+								</div>
 							</div>
 						</div>
-					</div>
-					<div v-else-if="message.type === 'text'" :class="$style.textMessage">
-						<span
-							v-if="message.role === 'user'"
-							v-n8n-html="renderMarkdown(message.content)"
-							:class="$style['rendered-content']"
-						></span>
-						<div
-							v-else
-							v-n8n-html="renderMarkdown(message.content)"
-							:class="[$style.assistantText, $style['rendered-content']]"
-						></div>
-						<div
-							v-if="message?.codeSnippet"
-							:class="$style['code-snippet']"
-							data-test-id="assistant-code-snippet"
-						>
-							<header v-if="isClipboardSupported">
-								<n8n-button
-									type="tertiary"
-									text="true"
-									size="mini"
-									data-test-id="assistant-copy-snippet-button"
-									@click="onCopyButtonClick(message.codeSnippet, $event)"
-								>
-									{{ t('assistantChat.copy') }}
-								</n8n-button>
-							</header>
+						<div v-else-if="message.type === 'text'" :class="$style.textMessage">
+							<span
+								v-if="message.role === 'user'"
+								v-n8n-html="renderMarkdown(message.content)"
+								:class="$style['rendered-content']"
+							></span>
 							<div
-								v-n8n-html="renderMarkdown(message.codeSnippet).trim()"
-								data-test-id="assistant-code-snippet-content"
-								:class="[$style['snippet-content'], $style['rendered-content']]"
+								v-else
+								v-n8n-html="renderMarkdown(message.content)"
+								:class="[$style.assistantText, $style['rendered-content']]"
 							></div>
+							<div
+								v-if="message?.codeSnippet"
+								:class="$style['code-snippet']"
+								data-test-id="assistant-code-snippet"
+							>
+								<header v-if="isClipboardSupported">
+									<n8n-button
+										type="tertiary"
+										text="true"
+										size="mini"
+										data-test-id="assistant-copy-snippet-button"
+										@click="onCopyButtonClick(message.codeSnippet, $event)"
+									>
+										{{ t('assistantChat.copy') }}
+									</n8n-button>
+								</header>
+								<div
+									v-n8n-html="renderMarkdown(message.codeSnippet).trim()"
+									data-test-id="assistant-code-snippet-content"
+									:class="[$style['snippet-content'], $style['rendered-content']]"
+								></div>
+							</div>
+							<BlinkingCursor
+								v-if="streaming && i === messages?.length - 1 && message.role === 'assistant'"
+							/>
 						</div>
-						<BlinkingCursor
-							v-if="streaming && i === messages?.length - 1 && message.role === 'assistant'"
-						/>
-					</div>
-					<div
-						v-else-if="message.type === 'error'"
-						:class="$style.error"
-						data-test-id="chat-message-system"
-					>
-						<span>⚠️ {{ message.content }}</span>
-						<n8n-button
-							v-if="message.retry"
-							type="secondary"
-							size="mini"
-							:class="$style.retryButton"
-							data-test-id="error-retry-button"
-							@click="() => message.retry?.()"
+						<div
+							v-else-if="message.type === 'error'"
+							:class="$style.error"
+							data-test-id="chat-message-system"
 						>
-							{{ t('generic.retry') }}
-						</n8n-button>
-					</div>
-					<div v-else-if="message.type === 'code-diff'">
-						<CodeDiff
-							:title="message.description"
-							:content="message.codeDiff"
-							:replacing="message.replacing"
-							:replaced="message.replaced"
-							:error="message.error"
-							:streaming="streaming && i === messages?.length - 1"
-							@replace="() => emit('codeReplace', i)"
-							@undo="() => emit('codeUndo', i)"
-						/>
-					</div>
-					<div
-						v-else-if="isEndOfSessionEvent(message)"
-						:class="$style.endOfSessionText"
-						data-test-id="chat-message-system"
-					>
-						<span>
-							{{ t('assistantChat.sessionEndMessage.1') }}
-						</span>
-						<InlineAskAssistantButton size="small" :static="true" />
-						<span>
-							{{ t('assistantChat.sessionEndMessage.2') }}
-						</span>
-					</div>
-
-					<div
-						v-if="
-							!streaming &&
-							'quickReplies' in message &&
-							message.quickReplies?.length &&
-							i === messages?.length - 1
-						"
-						:class="$style.quickReplies"
-					>
-						<div :class="$style.quickRepliesTitle">{{ t('assistantChat.quickRepliesTitle') }}</div>
-						<div v-for="opt in message.quickReplies" :key="opt.type" data-test-id="quick-replies">
+							<span>⚠️ {{ message.content }}</span>
 							<n8n-button
-								v-if="opt.text"
+								v-if="message.retry"
 								type="secondary"
 								size="mini"
-								@click="() => onQuickReply(opt)"
+								:class="$style.retryButton"
+								data-test-id="error-retry-button"
+								@click="() => message.retry?.()"
 							>
-								{{ opt.text }}
+								{{ t('generic.retry') }}
 							</n8n-button>
 						</div>
+						<div v-else-if="message.type === 'code-diff'">
+							<CodeDiff
+								:title="message.description"
+								:content="message.codeDiff"
+								:replacing="message.replacing"
+								:replaced="message.replaced"
+								:error="message.error"
+								:streaming="streaming && i === messages?.length - 1"
+								@replace="() => emit('codeReplace', i)"
+								@undo="() => emit('codeUndo', i)"
+							/>
+						</div>
+						<div
+							v-else-if="isEndOfSessionEvent(message)"
+							:class="$style.endOfSessionText"
+							data-test-id="chat-message-system"
+						>
+							<span>
+								{{ t('assistantChat.sessionEndMessage.1') }}
+							</span>
+							<InlineAskAssistantButton size="small" :static="true" />
+							<span>
+								{{ t('assistantChat.sessionEndMessage.2') }}
+							</span>
+						</div>
+
+						<div
+							v-if="
+								!streaming &&
+								'quickReplies' in message &&
+								message.quickReplies?.length &&
+								i === messages?.length - 1
+							"
+							:class="$style.quickReplies"
+						>
+							<div :class="$style.quickRepliesTitle">
+								{{ t('assistantChat.quickRepliesTitle') }}
+							</div>
+							<div v-for="opt in message.quickReplies" :key="opt.type" data-test-id="quick-replies">
+								<n8n-button
+									v-if="opt.text"
+									type="secondary"
+									size="mini"
+									@click="() => onQuickReply(opt)"
+								>
+									{{ opt.text }}
+								</n8n-button>
+							</div>
+						</div>
 					</div>
 				</div>
-			</div>
-			<div v-if="loadingMessage" :class="$style.messages">
-				<AssistantLoadingMessage :message="loadingMessage" />
+				<div
+					v-if="loadingMessage"
+					:class="{ [$style.message]: true, [$style.loading]: messages?.length }"
+				>
+					<AssistantLoadingMessage :message="loadingMessage" />
+				</div>
 			</div>
 			<div
 				v-else-if="showPlaceholder"
@@ -405,6 +414,10 @@ p {
 	margin-bottom: var(--spacing-xs);
 	font-size: var(--font-size-2xs);
 	line-height: var(--font-line-height-xloose);
+
+	&.loading {
+		margin-top: var(--spacing-m);
+	}
 }
 
 .roleName {
diff --git a/packages/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap b/packages/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
index 358b174503..d9c3b68e3f 100644
--- a/packages/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
+++ b/packages/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
@@ -76,80 +76,82 @@ exports[`AskAssistantChat > does not render retry button if no error is present
       <div
         class="messages"
       >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
+        <div>
+          
           <div
-            class="roleName"
+            class="message"
+            data-test-id="chat-message-assistant"
           >
             <div
-              class="container small"
+              class="roleName"
             >
-              <svg
-                fill="none"
-                height="10"
-                viewBox="0 0 24 24"
-                width="10"
-                xmlns="http://www.w3.org/2000/svg"
+              <div
+                class="container small"
               >
-                <path
-                  d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
-                  fill="white"
-                />
-                <defs>
-                  <lineargradient
-                    gradientUnits="userSpaceOnUse"
-                    id="paint0_linear_173_12825"
-                    x1="-3.67094e-07"
-                    x2="28.8315"
-                    y1="-0.000120994"
-                    y2="9.82667"
-                  >
-                    <stop
-                      stop-color="var(--color-assistant-highlight-1)"
-                    />
-                    <stop
-                      offset="0.495"
-                      stop-color="var(--color-assistant-highlight-2)"
-                    />
-                    <stop
-                      offset="1"
-                      stop-color="var(--color-assistant-highlight-3)"
-                    />
-                  </lineargradient>
-                </defs>
-              </svg>
+                <svg
+                  fill="none"
+                  height="10"
+                  viewBox="0 0 24 24"
+                  width="10"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+                    fill="white"
+                  />
+                  <defs>
+                    <lineargradient
+                      gradientUnits="userSpaceOnUse"
+                      id="paint0_linear_173_12825"
+                      x1="-3.67094e-07"
+                      x2="28.8315"
+                      y1="-0.000120994"
+                      y2="9.82667"
+                    >
+                      <stop
+                        stop-color="var(--color-assistant-highlight-1)"
+                      />
+                      <stop
+                        offset="0.495"
+                        stop-color="var(--color-assistant-highlight-2)"
+                      />
+                      <stop
+                        offset="1"
+                        stop-color="var(--color-assistant-highlight-3)"
+                      />
+                    </lineargradient>
+                  </defs>
+                </svg>
+              </div>
+              <span>
+                Assistant
+              </span>
             </div>
-            <span>
-              Assistant
-            </span>
-          </div>
-          <div
-            class="textMessage"
-          >
             <div
-              class="assistantText rendered-content"
+              class="textMessage"
             >
-              <p>
-                Hi Max! Here is my top solution to fix the error in your 
-                <strong>
-                  Transform data
-                </strong>
-                 node👇
-              </p>
-              
+              <div
+                class="assistantText rendered-content"
+              >
+                <p>
+                  Hi Max! Here is my top solution to fix the error in your 
+                  <strong>
+                    Transform data
+                  </strong>
+                   node👇
+                </p>
+                
 
+              </div>
+              <!--v-if-->
+              <!--v-if-->
             </div>
             <!--v-if-->
-            <!--v-if-->
           </div>
-          <!--v-if-->
+          
         </div>
-        
+        <!--v-if-->
       </div>
-      <!--v-if-->
     </div>
     <div
       class="inputWrapper"
@@ -251,653 +253,655 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
       <div
         class="messages"
       >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
+        <div>
+          
           <div
-            class="roleName"
+            class="message"
+            data-test-id="chat-message-assistant"
           >
             <div
-              class="container small"
-            >
-              <svg
-                fill="none"
-                height="10"
-                viewBox="0 0 24 24"
-                width="10"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
-                  fill="white"
-                />
-                <defs>
-                  <lineargradient
-                    gradientUnits="userSpaceOnUse"
-                    id="paint0_linear_173_12825"
-                    x1="-3.67094e-07"
-                    x2="28.8315"
-                    y1="-0.000120994"
-                    y2="9.82667"
-                  >
-                    <stop
-                      stop-color="var(--color-assistant-highlight-1)"
-                    />
-                    <stop
-                      offset="0.495"
-                      stop-color="var(--color-assistant-highlight-2)"
-                    />
-                    <stop
-                      offset="1"
-                      stop-color="var(--color-assistant-highlight-3)"
-                    />
-                  </lineargradient>
-                </defs>
-              </svg>
-            </div>
-            <span>
-              Assistant
-            </span>
-          </div>
-          <div
-            class="textMessage"
-          >
-            <div
-              class="assistantText rendered-content"
-            >
-              <p>
-                Hi Max! Here is my top solution to fix the error in your 
-                <strong>
-                  Transform data
-                </strong>
-                 node👇
-              </p>
-              
-
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <!--v-if-->
-        </div>
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <!--v-if-->
-          <div>
-            <div
-              class="container"
-              data-test-id="code-diff-suggestion"
+              class="roleName"
             >
               <div
-                class="title"
+                class="container small"
               >
-                Short solution description here that can spill over to two lines
+                <svg
+                  fill="none"
+                  height="10"
+                  viewBox="0 0 24 24"
+                  width="10"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+                    fill="white"
+                  />
+                  <defs>
+                    <lineargradient
+                      gradientUnits="userSpaceOnUse"
+                      id="paint0_linear_173_12825"
+                      x1="-3.67094e-07"
+                      x2="28.8315"
+                      y1="-0.000120994"
+                      y2="9.82667"
+                    >
+                      <stop
+                        stop-color="var(--color-assistant-highlight-1)"
+                      />
+                      <stop
+                        offset="0.495"
+                        stop-color="var(--color-assistant-highlight-2)"
+                      />
+                      <stop
+                        offset="1"
+                        stop-color="var(--color-assistant-highlight-3)"
+                      />
+                    </lineargradient>
+                  </defs>
+                </svg>
               </div>
+              <span>
+                Assistant
+              </span>
+            </div>
+            <div
+              class="textMessage"
+            >
               <div
-                class="diffSection"
+                class="assistantText rendered-content"
               >
+                <p>
+                  Hi Max! Here is my top solution to fix the error in your 
+                  <strong>
+                    Transform data
+                  </strong>
+                   node👇
+                </p>
                 
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     
-                  </div>
-                  <div
-                    class="del diffContent"
-                  >
-                    <span>
-                       - 
-                    </span>
-                    <span>
-                      The Way that can be told of is not the eternal Way;
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     
-                  </div>
-                  <div
-                    class="del diffContent"
-                  >
-                    <span>
-                       - 
-                    </span>
-                    <span>
-                      The name that can be named is not the eternal name.
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     
-                  </div>
-                  <div
-                    class="del diffContent"
-                  >
-                    <span>
-                       - 
-                    </span>
-                    <span>
-                      The Named is the mother of all things.
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     1
-                  </div>
-                  <div
-                    class="add diffContent"
-                  >
-                    <span>
-                       + 
-                    </span>
-                    <span>
-                      The named is the mother of all things.
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     2
-                  </div>
-                  <div
-                    class="add diffContent"
-                  >
-                    <span>
-                       + 
-                    </span>
-                    <span />
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     3
-                  </div>
-                  <div
-                    class="normal diffContent"
-                  >
-                    <span>
-                         
-                    </span>
-                    <span>
-                       The two are the same,
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     4
-                  </div>
-                  <div
-                    class="normal diffContent"
-                  >
-                    <span>
-                         
-                    </span>
-                    <span>
-                       But after they are produced,
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     5
-                  </div>
-                  <div
-                    class="normal diffContent"
-                  >
-                    <span>
-                         
-                    </span>
-                    <span>
-                       they have different names.
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     6
-                  </div>
-                  <div
-                    class="add diffContent"
-                  >
-                    <span>
-                       + 
-                    </span>
-                    <span>
-                      They both may be called deep and profound.
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     7
-                  </div>
-                  <div
-                    class="add diffContent"
-                  >
-                    <span>
-                       + 
-                    </span>
-                    <span>
-                      Deeper and more profound,
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     8
-                  </div>
-                  <div
-                    class="add diffContent"
-                  >
-                    <span>
-                       + 
-                    </span>
-                    <span>
-                      The door of all subtleties!
-                    </span>
-                  </div>
-                </div>
-                
-              </div>
-              <div
-                class="actions"
-              >
-                <n8n-button-stub
-                  data-test-id="replace-code-button"
-                  disabled="false"
-                  icon="refresh"
-                  loading="false"
-                  size="mini"
-                  type="primary"
-                />
-              </div>
-            </div>
-          </div>
-          <!--v-if-->
-        </div>
-        <div
-          class="message"
-          data-test-id="chat-message-user"
-        >
-          <div
-            class="roleName userSection"
-          >
-            <n8n-avatar-stub
-              first-name="Kobi"
-              last-name="Dog"
-              size="xsmall"
-            />
-            <span>
-              You
-            </span>
-          </div>
-          <div
-            class="textMessage"
-          >
-            <span
-              class="rendered-content"
-            >
-              <p>
-                Give it to me 
-                <strong>
-                  ignore this markdown
-                </strong>
-              </p>
-              
 
-            </span>
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <!--v-if-->
-        </div>
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <div
-            class="roleName userSection"
-          >
-            <div
-              class="container small"
-            >
-              <svg
-                fill="none"
-                height="10"
-                viewBox="0 0 24 24"
-                width="10"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
-                  fill="white"
-                />
-                <defs>
-                  <lineargradient
-                    gradientUnits="userSpaceOnUse"
-                    id="paint0_linear_173_12825"
-                    x1="-3.67094e-07"
-                    x2="28.8315"
-                    y1="-0.000120994"
-                    y2="9.82667"
-                  >
-                    <stop
-                      stop-color="var(--color-assistant-highlight-1)"
-                    />
-                    <stop
-                      offset="0.495"
-                      stop-color="var(--color-assistant-highlight-2)"
-                    />
-                    <stop
-                      offset="1"
-                      stop-color="var(--color-assistant-highlight-3)"
-                    />
-                  </lineargradient>
-                </defs>
-              </svg>
-            </div>
-            <span>
-              Assistant
-            </span>
-          </div>
-          <div>
-            <div
-              class="block"
-            >
-              <div
-                class="blockTitle"
-              >
-                Credential doesn’t have correct permissions to send a message 
-                <!--v-if-->
               </div>
+              <!--v-if-->
+              <!--v-if-->
+            </div>
+            <!--v-if-->
+          </div>
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <!--v-if-->
+            <div>
               <div
-                class="blockBody"
+                class="container"
+                data-test-id="code-diff-suggestion"
               >
-                <span
-                  class="rendered-content"
+                <div
+                  class="title"
+                >
+                  Short solution description here that can spill over to two lines
+                </div>
+                <div
+                  class="diffSection"
                 >
-                  <p>
-                    Solution steps:
-                  </p>
                   
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       
+                    </div>
+                    <div
+                      class="del diffContent"
+                    >
+                      <span>
+                         - 
+                      </span>
+                      <span>
+                        The Way that can be told of is not the eternal Way;
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       
+                    </div>
+                    <div
+                      class="del diffContent"
+                    >
+                      <span>
+                         - 
+                      </span>
+                      <span>
+                        The name that can be named is not the eternal name.
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       
+                    </div>
+                    <div
+                      class="del diffContent"
+                    >
+                      <span>
+                         - 
+                      </span>
+                      <span>
+                        The Named is the mother of all things.
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       1
+                    </div>
+                    <div
+                      class="add diffContent"
+                    >
+                      <span>
+                         + 
+                      </span>
+                      <span>
+                        The named is the mother of all things.
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       2
+                    </div>
+                    <div
+                      class="add diffContent"
+                    >
+                      <span>
+                         + 
+                      </span>
+                      <span />
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       3
+                    </div>
+                    <div
+                      class="normal diffContent"
+                    >
+                      <span>
+                           
+                      </span>
+                      <span>
+                         The two are the same,
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       4
+                    </div>
+                    <div
+                      class="normal diffContent"
+                    >
+                      <span>
+                           
+                      </span>
+                      <span>
+                         But after they are produced,
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       5
+                    </div>
+                    <div
+                      class="normal diffContent"
+                    >
+                      <span>
+                           
+                      </span>
+                      <span>
+                         they have different names.
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       6
+                    </div>
+                    <div
+                      class="add diffContent"
+                    >
+                      <span>
+                         + 
+                      </span>
+                      <span>
+                        They both may be called deep and profound.
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       7
+                    </div>
+                    <div
+                      class="add diffContent"
+                    >
+                      <span>
+                         + 
+                      </span>
+                      <span>
+                        Deeper and more profound,
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       8
+                    </div>
+                    <div
+                      class="add diffContent"
+                    >
+                      <span>
+                         + 
+                      </span>
+                      <span>
+                        The door of all subtleties!
+                      </span>
+                    </div>
+                  </div>
+                  
+                </div>
+                <div
+                  class="actions"
+                >
+                  <n8n-button-stub
+                    data-test-id="replace-code-button"
+                    disabled="false"
+                    icon="refresh"
+                    loading="false"
+                    size="mini"
+                    type="primary"
+                  />
+                </div>
+              </div>
+            </div>
+            <!--v-if-->
+          </div>
+          <div
+            class="message"
+            data-test-id="chat-message-user"
+          >
+            <div
+              class="roleName userSection"
+            >
+              <n8n-avatar-stub
+                first-name="Kobi"
+                last-name="Dog"
+                size="xsmall"
+              />
+              <span>
+                You
+              </span>
+            </div>
+            <div
+              class="textMessage"
+            >
+              <span
+                class="rendered-content"
+              >
+                <p>
+                  Give it to me 
+                  <strong>
+                    ignore this markdown
+                  </strong>
+                </p>
+                
 
-                  <ol>
+              </span>
+              <!--v-if-->
+              <!--v-if-->
+            </div>
+            <!--v-if-->
+          </div>
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <div
+              class="roleName userSection"
+            >
+              <div
+                class="container small"
+              >
+                <svg
+                  fill="none"
+                  height="10"
+                  viewBox="0 0 24 24"
+                  width="10"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+                    fill="white"
+                  />
+                  <defs>
+                    <lineargradient
+                      gradientUnits="userSpaceOnUse"
+                      id="paint0_linear_173_12825"
+                      x1="-3.67094e-07"
+                      x2="28.8315"
+                      y1="-0.000120994"
+                      y2="9.82667"
+                    >
+                      <stop
+                        stop-color="var(--color-assistant-highlight-1)"
+                      />
+                      <stop
+                        offset="0.495"
+                        stop-color="var(--color-assistant-highlight-2)"
+                      />
+                      <stop
+                        offset="1"
+                        stop-color="var(--color-assistant-highlight-3)"
+                      />
+                    </lineargradient>
+                  </defs>
+                </svg>
+              </div>
+              <span>
+                Assistant
+              </span>
+            </div>
+            <div>
+              <div
+                class="block"
+              >
+                <div
+                  class="blockTitle"
+                >
+                  Credential doesn’t have correct permissions to send a message 
+                  <!--v-if-->
+                </div>
+                <div
+                  class="blockBody"
+                >
+                  <span
+                    class="rendered-content"
+                  >
+                    <p>
+                      Solution steps:
+                    </p>
                     
 
-                    <li>
-                      Lorem ipsum dolor sit amet, consectetur 
-                      <strong>
-                        adipiscing
-                      </strong>
-                       elit. Proin id nulla placerat, tristique ex at, euismod dui.
-                    </li>
-                    
-
-                    <li>
-                      Copy this into somewhere
-                    </li>
-                    
-
-                    <li>
-                      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui.
-                    </li>
-                    
-
-                    <li>
-                      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui.
-                      <br />
+                    <ol>
                       
+
+                      <li>
+                        Lorem ipsum dolor sit amet, consectetur 
+                        <strong>
+                          adipiscing
+                        </strong>
+                         elit. Proin id nulla placerat, tristique ex at, euismod dui.
+                      </li>
+                      
+
+                      <li>
+                        Copy this into somewhere
+                      </li>
+                      
+
+                      <li>
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui.
+                      </li>
+                      
+
+                      <li>
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui.
+                        <br />
+                        
 Testing more code
-                    </li>
+                      </li>
+                      
+
+                    </ol>
                     
 
-                  </ol>
-                  
+                    <ul>
+                      
 
-                  <ul>
+                      <li>
+                        Unordered item 1
+                      </li>
+                      
+
+                      <li>
+                        Unordered item 2
+                      </li>
+                      
+
+                    </ul>
                     
 
-                    <li>
-                      Unordered item 1
-                    </li>
-                    
-
-                    <li>
-                      Unordered item 2
-                    </li>
-                    
-
-                  </ul>
-                  
-
-                </span>
-                <!--v-if-->
-              </div>
-            </div>
-          </div>
-          <!--v-if-->
-        </div>
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <!--v-if-->
-          <div>
-            <div
-              class="container"
-              data-test-id="code-diff-suggestion"
-            >
-              <div
-                class="title"
-              >
-                Short solution with min height
-              </div>
-              <div
-                class="diffSection"
-              >
-                
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     
-                  </div>
-                  <div
-                    class="del diffContent"
-                  >
-                    <span>
-                       - 
-                    </span>
-                    <span>
-                      The Way that can be told of is not the eternal Way;
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     
-                  </div>
-                  <div
-                    class="del diffContent"
-                  >
-                    <span>
-                       - 
-                    </span>
-                    <span>
-                      The name that can be named is not the eternal name.
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     1
-                  </div>
-                  <div
-                    class="add diffContent"
-                  >
-                    <span>
-                       + 
-                    </span>
-                    <span>
-                      The door of all subtleties!
-                    </span>
-                  </div>
-                </div>
-                <div
-                  class="diff"
-                >
-                  <div
-                    class="lineNumber"
-                  >
-                    <!-- ln1 is line number in original text -->
-                    <!-- ln2 is line number in updated text -->
-                     
-                  </div>
-                  <div
-                    class="filler diffContent"
-                  >
-                    <span>
-                         
-                    </span>
-                    <span />
-                  </div>
-                </div>
-                
-              </div>
-              <div
-                class="actions"
-              >
-                <n8n-button-stub
-                  data-test-id="replace-code-button"
-                  disabled="false"
-                  icon="refresh"
-                  loading="false"
-                  size="mini"
-                  type="primary"
-                />
+                  </span>
+                  <!--v-if-->
+                </div>
               </div>
             </div>
+            <!--v-if-->
           </div>
           <div
-            class="quickReplies"
+            class="message"
+            data-test-id="chat-message-assistant"
           >
-            <div
-              class="quickRepliesTitle"
-            >
-              Quick reply 👇
-            </div>
-            
-            <div
-              data-test-id="quick-replies"
-            >
-              <n8n-button-stub
-                size="mini"
-                type="secondary"
-              />
+            <!--v-if-->
+            <div>
+              <div
+                class="container"
+                data-test-id="code-diff-suggestion"
+              >
+                <div
+                  class="title"
+                >
+                  Short solution with min height
+                </div>
+                <div
+                  class="diffSection"
+                >
+                  
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       
+                    </div>
+                    <div
+                      class="del diffContent"
+                    >
+                      <span>
+                         - 
+                      </span>
+                      <span>
+                        The Way that can be told of is not the eternal Way;
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       
+                    </div>
+                    <div
+                      class="del diffContent"
+                    >
+                      <span>
+                         - 
+                      </span>
+                      <span>
+                        The name that can be named is not the eternal name.
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       1
+                    </div>
+                    <div
+                      class="add diffContent"
+                    >
+                      <span>
+                         + 
+                      </span>
+                      <span>
+                        The door of all subtleties!
+                      </span>
+                    </div>
+                  </div>
+                  <div
+                    class="diff"
+                  >
+                    <div
+                      class="lineNumber"
+                    >
+                      <!-- ln1 is line number in original text -->
+                      <!-- ln2 is line number in updated text -->
+                       
+                    </div>
+                    <div
+                      class="filler diffContent"
+                    >
+                      <span>
+                           
+                      </span>
+                      <span />
+                    </div>
+                  </div>
+                  
+                </div>
+                <div
+                  class="actions"
+                >
+                  <n8n-button-stub
+                    data-test-id="replace-code-button"
+                    disabled="false"
+                    icon="refresh"
+                    loading="false"
+                    size="mini"
+                    type="primary"
+                  />
+                </div>
+              </div>
             </div>
             <div
-              data-test-id="quick-replies"
+              class="quickReplies"
             >
-              <n8n-button-stub
-                size="mini"
-                type="secondary"
-              />
+              <div
+                class="quickRepliesTitle"
+              >
+                Quick reply 👇
+              </div>
+              
+              <div
+                data-test-id="quick-replies"
+              >
+                <n8n-button-stub
+                  size="mini"
+                  type="secondary"
+                />
+              </div>
+              <div
+                data-test-id="quick-replies"
+              >
+                <n8n-button-stub
+                  size="mini"
+                  type="secondary"
+                />
+              </div>
+              
             </div>
-            
           </div>
+          
         </div>
-        
+        <!--v-if-->
       </div>
-      <!--v-if-->
     </div>
     <div
       class="inputWrapper"
@@ -996,7 +1000,6 @@ exports[`AskAssistantChat > renders default placeholder chat correctly 1`] = `
     <div
       class="body"
     >
-      <!--v-if-->
       <div
         class="placeholder"
         data-test-id="placeholder-message"
@@ -1175,151 +1178,153 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
       <div
         class="messages"
       >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
+        <div>
+          
           <div
-            class="roleName"
+            class="message"
+            data-test-id="chat-message-assistant"
           >
             <div
-              class="container small"
+              class="roleName"
             >
-              <svg
-                fill="none"
-                height="10"
-                viewBox="0 0 24 24"
-                width="10"
-                xmlns="http://www.w3.org/2000/svg"
+              <div
+                class="container small"
               >
-                <path
-                  d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
-                  fill="white"
-                />
-                <defs>
-                  <lineargradient
-                    gradientUnits="userSpaceOnUse"
-                    id="paint0_linear_173_12825"
-                    x1="-3.67094e-07"
-                    x2="28.8315"
-                    y1="-0.000120994"
-                    y2="9.82667"
-                  >
-                    <stop
-                      stop-color="var(--color-assistant-highlight-1)"
-                    />
-                    <stop
-                      offset="0.495"
-                      stop-color="var(--color-assistant-highlight-2)"
-                    />
-                    <stop
-                      offset="1"
-                      stop-color="var(--color-assistant-highlight-3)"
-                    />
-                  </lineargradient>
-                </defs>
-              </svg>
-            </div>
-            <span>
-              Assistant
-            </span>
-          </div>
-          <div
-            class="textMessage"
-          >
-            <div
-              class="assistantText rendered-content"
-            >
-              <p>
-                Hi Max! Here is my top solution to fix the error in your 
-                <strong>
-                  Transform data
-                </strong>
-                 node👇
-              </p>
-              
-
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <!--v-if-->
-        </div>
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <!--v-if-->
-          <div
-            class="endOfSessionText"
-            data-test-id="chat-message-system"
-          >
-            <span>
-              This Assistant session has ended. To start a new session with the Assistant, click an
-            </span>
-            <button
-              class="button"
-              data-test-id="ask-assistant-button"
-              style="height: 18px;"
-              tabindex="-1"
-            >
-              <div>
-                <div
-                  style="padding: 0px 6px;"
+                <svg
+                  fill="none"
+                  height="10"
+                  viewBox="0 0 24 24"
+                  width="10"
+                  xmlns="http://www.w3.org/2000/svg"
                 >
-                  <svg
-                    class="icon"
-                    fill="none"
-                    height="10"
-                    viewBox="0 0 24 24"
-                    width="10"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
-                      fill="url(#paint0_linear_173_12825)"
-                    />
-                    <defs>
-                      <lineargradient
-                        gradientUnits="userSpaceOnUse"
-                        id="paint0_linear_173_12825"
-                        x1="-3.67094e-07"
-                        x2="28.8315"
-                        y1="-0.000120994"
-                        y2="9.82667"
-                      >
-                        <stop
-                          stop-color="var(--color-assistant-highlight-1)"
-                        />
-                        <stop
-                          offset="0.495"
-                          stop-color="var(--color-assistant-highlight-2)"
-                        />
-                        <stop
-                          offset="1"
-                          stop-color="var(--color-assistant-highlight-3)"
-                        />
-                      </lineargradient>
-                    </defs>
-                  </svg>
-                  <span
-                    class="text small"
-                  >
-                    Ask Assistant
-                  </span>
-                </div>
+                  <path
+                    d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+                    fill="white"
+                  />
+                  <defs>
+                    <lineargradient
+                      gradientUnits="userSpaceOnUse"
+                      id="paint0_linear_173_12825"
+                      x1="-3.67094e-07"
+                      x2="28.8315"
+                      y1="-0.000120994"
+                      y2="9.82667"
+                    >
+                      <stop
+                        stop-color="var(--color-assistant-highlight-1)"
+                      />
+                      <stop
+                        offset="0.495"
+                        stop-color="var(--color-assistant-highlight-2)"
+                      />
+                      <stop
+                        offset="1"
+                        stop-color="var(--color-assistant-highlight-3)"
+                      />
+                    </lineargradient>
+                  </defs>
+                </svg>
               </div>
-            </button>
-            <span>
-              button in n8n
-            </span>
+              <span>
+                Assistant
+              </span>
+            </div>
+            <div
+              class="textMessage"
+            >
+              <div
+                class="assistantText rendered-content"
+              >
+                <p>
+                  Hi Max! Here is my top solution to fix the error in your 
+                  <strong>
+                    Transform data
+                  </strong>
+                   node👇
+                </p>
+                
+
+              </div>
+              <!--v-if-->
+              <!--v-if-->
+            </div>
+            <!--v-if-->
           </div>
-          <!--v-if-->
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <!--v-if-->
+            <div
+              class="endOfSessionText"
+              data-test-id="chat-message-system"
+            >
+              <span>
+                This Assistant session has ended. To start a new session with the Assistant, click an
+              </span>
+              <button
+                class="button"
+                data-test-id="ask-assistant-button"
+                style="height: 18px;"
+                tabindex="-1"
+              >
+                <div>
+                  <div
+                    style="padding: 0px 6px;"
+                  >
+                    <svg
+                      class="icon"
+                      fill="none"
+                      height="10"
+                      viewBox="0 0 24 24"
+                      width="10"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+                        fill="url(#paint0_linear_173_12825)"
+                      />
+                      <defs>
+                        <lineargradient
+                          gradientUnits="userSpaceOnUse"
+                          id="paint0_linear_173_12825"
+                          x1="-3.67094e-07"
+                          x2="28.8315"
+                          y1="-0.000120994"
+                          y2="9.82667"
+                        >
+                          <stop
+                            stop-color="var(--color-assistant-highlight-1)"
+                          />
+                          <stop
+                            offset="0.495"
+                            stop-color="var(--color-assistant-highlight-2)"
+                          />
+                          <stop
+                            offset="1"
+                            stop-color="var(--color-assistant-highlight-3)"
+                          />
+                        </lineargradient>
+                      </defs>
+                    </svg>
+                    <span
+                      class="text small"
+                    >
+                      Ask Assistant
+                    </span>
+                  </div>
+                </div>
+              </button>
+              <span>
+                button in n8n
+              </span>
+            </div>
+            <!--v-if-->
+          </div>
+          
         </div>
-        
+        <!--v-if-->
       </div>
-      <!--v-if-->
     </div>
     <div
       class="inputWrapper disabledInput"
@@ -1422,75 +1427,77 @@ exports[`AskAssistantChat > renders error message correctly with retry button 1`
       <div
         class="messages"
       >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
+        <div>
+          
           <div
-            class="roleName"
+            class="message"
+            data-test-id="chat-message-assistant"
           >
             <div
-              class="container small"
+              class="roleName"
             >
-              <svg
-                fill="none"
-                height="10"
-                viewBox="0 0 24 24"
-                width="10"
-                xmlns="http://www.w3.org/2000/svg"
+              <div
+                class="container small"
               >
-                <path
-                  d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
-                  fill="white"
-                />
-                <defs>
-                  <lineargradient
-                    gradientUnits="userSpaceOnUse"
-                    id="paint0_linear_173_12825"
-                    x1="-3.67094e-07"
-                    x2="28.8315"
-                    y1="-0.000120994"
-                    y2="9.82667"
-                  >
-                    <stop
-                      stop-color="var(--color-assistant-highlight-1)"
-                    />
-                    <stop
-                      offset="0.495"
-                      stop-color="var(--color-assistant-highlight-2)"
-                    />
-                    <stop
-                      offset="1"
-                      stop-color="var(--color-assistant-highlight-3)"
-                    />
-                  </lineargradient>
-                </defs>
-              </svg>
+                <svg
+                  fill="none"
+                  height="10"
+                  viewBox="0 0 24 24"
+                  width="10"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+                    fill="white"
+                  />
+                  <defs>
+                    <lineargradient
+                      gradientUnits="userSpaceOnUse"
+                      id="paint0_linear_173_12825"
+                      x1="-3.67094e-07"
+                      x2="28.8315"
+                      y1="-0.000120994"
+                      y2="9.82667"
+                    >
+                      <stop
+                        stop-color="var(--color-assistant-highlight-1)"
+                      />
+                      <stop
+                        offset="0.495"
+                        stop-color="var(--color-assistant-highlight-2)"
+                      />
+                      <stop
+                        offset="1"
+                        stop-color="var(--color-assistant-highlight-3)"
+                      />
+                    </lineargradient>
+                  </defs>
+                </svg>
+              </div>
+              <span>
+                Assistant
+              </span>
             </div>
-            <span>
-              Assistant
-            </span>
+            <div
+              class="error"
+              data-test-id="chat-message-system"
+            >
+              <span>
+                ⚠️ This is an error message.
+              </span>
+              <n8n-button-stub
+                class="retryButton"
+                data-test-id="error-retry-button"
+                size="mini"
+                type="secondary"
+              />
+            </div>
+            <!--v-if-->
           </div>
-          <div
-            class="error"
-            data-test-id="chat-message-system"
-          >
-            <span>
-              ⚠️ This is an error message.
-            </span>
-            <n8n-button-stub
-              class="retryButton"
-              data-test-id="error-retry-button"
-              size="mini"
-              type="secondary"
-            />
-          </div>
-          <!--v-if-->
+          
         </div>
-        
+        <!--v-if-->
       </div>
-      <!--v-if-->
     </div>
     <div
       class="inputWrapper"
@@ -1592,150 +1599,152 @@ exports[`AskAssistantChat > renders message with code snippet 1`] = `
       <div
         class="messages"
       >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
+        <div>
+          
           <div
-            class="roleName"
+            class="message"
+            data-test-id="chat-message-assistant"
           >
             <div
-              class="container small"
+              class="roleName"
             >
-              <svg
-                fill="none"
-                height="10"
-                viewBox="0 0 24 24"
-                width="10"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
-                  fill="white"
-                />
-                <defs>
-                  <lineargradient
-                    gradientUnits="userSpaceOnUse"
-                    id="paint0_linear_173_12825"
-                    x1="-3.67094e-07"
-                    x2="28.8315"
-                    y1="-0.000120994"
-                    y2="9.82667"
-                  >
-                    <stop
-                      stop-color="var(--color-assistant-highlight-1)"
-                    />
-                    <stop
-                      offset="0.495"
-                      stop-color="var(--color-assistant-highlight-2)"
-                    />
-                    <stop
-                      offset="1"
-                      stop-color="var(--color-assistant-highlight-3)"
-                    />
-                  </lineargradient>
-                </defs>
-              </svg>
-            </div>
-            <span>
-              Assistant
-            </span>
-          </div>
-          <div
-            class="textMessage"
-          >
-            <div
-              class="assistantText rendered-content"
-            >
-              <p>
-                Hi Max! Here is my top solution to fix the error in your 
-                <strong>
-                  Transform data
-                </strong>
-                 node👇
-              </p>
-              
-
-            </div>
-            <div
-              class="code-snippet"
-              data-test-id="assistant-code-snippet"
-            >
-              <!--v-if-->
               <div
-                class="snippet-content rendered-content"
-                data-test-id="assistant-code-snippet-content"
+                class="container small"
+              >
+                <svg
+                  fill="none"
+                  height="10"
+                  viewBox="0 0 24 24"
+                  width="10"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+                    fill="white"
+                  />
+                  <defs>
+                    <lineargradient
+                      gradientUnits="userSpaceOnUse"
+                      id="paint0_linear_173_12825"
+                      x1="-3.67094e-07"
+                      x2="28.8315"
+                      y1="-0.000120994"
+                      y2="9.82667"
+                    >
+                      <stop
+                        stop-color="var(--color-assistant-highlight-1)"
+                      />
+                      <stop
+                        offset="0.495"
+                        stop-color="var(--color-assistant-highlight-2)"
+                      />
+                      <stop
+                        offset="1"
+                        stop-color="var(--color-assistant-highlight-3)"
+                      />
+                    </lineargradient>
+                  </defs>
+                </svg>
+              </div>
+              <span>
+                Assistant
+              </span>
+            </div>
+            <div
+              class="textMessage"
+            >
+              <div
+                class="assistantText rendered-content"
               >
                 <p>
-                  node.on('input', function(msg) {
-                  <br />
-                  
-if (msg.seed) { dummyjson.seed = msg.seed; }
-                  <br />
-                  
-try {
-                  <br />
-                  
-var value = dummyjson.parse(node.template, {mockdata: msg});
-                  <br />
-                  
-if (node.syntax === 'json') {
-                  <br />
-                  
-try { value = JSON.parse(value); }
-                  <br />
-                  
-catch(e) { node.error(RED._('datagen.errors.json-error')); }
-                  <br />
-                  
-}
-                  <br />
-                  
-if (node.fieldType === 'msg') {
-                  <br />
-                  
-RED.util.setMessageProperty(msg,node.field,value);
-                  <br />
-                  
-}
-                  <br />
-                  
-else if (node.fieldType === 'flow') {
-                  <br />
-                  
-node.context().flow.set(node.field,value);
-                  <br />
-                  
-}
-                  <br />
-                  
-else if (node.fieldType === 'global') {
-                  <br />
-                  
-node.context().global.set(node.field,value);
-                  <br />
-                  
-}
-                  <br />
-                  
-node.send(msg);
-                  <br />
-                  
-}
-                  <br />
-                  
-catch(e) {
+                  Hi Max! Here is my top solution to fix the error in your 
+                  <strong>
+                    Transform data
+                  </strong>
+                   node👇
                 </p>
+                
+
               </div>
+              <div
+                class="code-snippet"
+                data-test-id="assistant-code-snippet"
+              >
+                <!--v-if-->
+                <div
+                  class="snippet-content rendered-content"
+                  data-test-id="assistant-code-snippet-content"
+                >
+                  <p>
+                    node.on('input', function(msg) {
+                    <br />
+                    
+if (msg.seed) { dummyjson.seed = msg.seed; }
+                    <br />
+                    
+try {
+                    <br />
+                    
+var value = dummyjson.parse(node.template, {mockdata: msg});
+                    <br />
+                    
+if (node.syntax === 'json') {
+                    <br />
+                    
+try { value = JSON.parse(value); }
+                    <br />
+                    
+catch(e) { node.error(RED._('datagen.errors.json-error')); }
+                    <br />
+                    
+}
+                    <br />
+                    
+if (node.fieldType === 'msg') {
+                    <br />
+                    
+RED.util.setMessageProperty(msg,node.field,value);
+                    <br />
+                    
+}
+                    <br />
+                    
+else if (node.fieldType === 'flow') {
+                    <br />
+                    
+node.context().flow.set(node.field,value);
+                    <br />
+                    
+}
+                    <br />
+                    
+else if (node.fieldType === 'global') {
+                    <br />
+                    
+node.context().global.set(node.field,value);
+                    <br />
+                    
+}
+                    <br />
+                    
+node.send(msg);
+                    <br />
+                    
+}
+                    <br />
+                    
+catch(e) {
+                  </p>
+                </div>
+              </div>
+              <!--v-if-->
             </div>
             <!--v-if-->
           </div>
-          <!--v-if-->
+          
         </div>
-        
+        <!--v-if-->
       </div>
-      <!--v-if-->
     </div>
     <div
       class="inputWrapper"
@@ -1837,82 +1846,84 @@ exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
       <div
         class="messages"
       >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
+        <div>
+          
           <div
-            class="roleName"
+            class="message"
+            data-test-id="chat-message-assistant"
           >
             <div
-              class="container small"
+              class="roleName"
             >
-              <svg
-                fill="none"
-                height="10"
-                viewBox="0 0 24 24"
-                width="10"
-                xmlns="http://www.w3.org/2000/svg"
+              <div
+                class="container small"
               >
-                <path
-                  d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
-                  fill="white"
-                />
-                <defs>
-                  <lineargradient
-                    gradientUnits="userSpaceOnUse"
-                    id="paint0_linear_173_12825"
-                    x1="-3.67094e-07"
-                    x2="28.8315"
-                    y1="-0.000120994"
-                    y2="9.82667"
-                  >
-                    <stop
-                      stop-color="var(--color-assistant-highlight-1)"
-                    />
-                    <stop
-                      offset="0.495"
-                      stop-color="var(--color-assistant-highlight-2)"
-                    />
-                    <stop
-                      offset="1"
-                      stop-color="var(--color-assistant-highlight-3)"
-                    />
-                  </lineargradient>
-                </defs>
-              </svg>
+                <svg
+                  fill="none"
+                  height="10"
+                  viewBox="0 0 24 24"
+                  width="10"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+                    fill="white"
+                  />
+                  <defs>
+                    <lineargradient
+                      gradientUnits="userSpaceOnUse"
+                      id="paint0_linear_173_12825"
+                      x1="-3.67094e-07"
+                      x2="28.8315"
+                      y1="-0.000120994"
+                      y2="9.82667"
+                    >
+                      <stop
+                        stop-color="var(--color-assistant-highlight-1)"
+                      />
+                      <stop
+                        offset="0.495"
+                        stop-color="var(--color-assistant-highlight-2)"
+                      />
+                      <stop
+                        offset="1"
+                        stop-color="var(--color-assistant-highlight-3)"
+                      />
+                    </lineargradient>
+                  </defs>
+                </svg>
+              </div>
+              <span>
+                Assistant
+              </span>
             </div>
-            <span>
-              Assistant
-            </span>
-          </div>
-          <div
-            class="textMessage"
-          >
             <div
-              class="assistantText rendered-content"
+              class="textMessage"
             >
-              <p>
-                Hi Max! Here is my top solution to fix the error in your 
-                <strong>
-                  Transform data
-                </strong>
-                 node👇
-              </p>
-              
+              <div
+                class="assistantText rendered-content"
+              >
+                <p>
+                  Hi Max! Here is my top solution to fix the error in your 
+                  <strong>
+                    Transform data
+                  </strong>
+                   node👇
+                </p>
+                
 
+              </div>
+              <!--v-if-->
+              <span
+                class="blinking-cursor"
+              />
             </div>
             <!--v-if-->
-            <span
-              class="blinking-cursor"
-            />
           </div>
-          <!--v-if-->
+          
         </div>
-        
+        <!--v-if-->
       </div>
-      <!--v-if-->
     </div>
     <div
       class="inputWrapper"
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue b/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
index a2e406dab3..18b2c9eb0c 100644
--- a/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
+++ b/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
@@ -29,11 +29,11 @@ withDefaults(
 .container {
 	display: flex;
 	gap: var(--spacing-3xs);
-	align-items: flex-start;
 	user-select: none;
 }
 
 .avatar {
+	height: var(--spacing-s);
 	animation: pulse 1.5s infinite;
 	position: relative;
 }
diff --git a/packages/design-system/src/components/N8nCard/Card.vue b/packages/design-system/src/components/N8nCard/Card.vue
index 589a7f6c36..17630a4d1e 100644
--- a/packages/design-system/src/components/N8nCard/Card.vue
+++ b/packages/design-system/src/components/N8nCard/Card.vue
@@ -20,10 +20,10 @@ const classes = computed(() => ({
 
 <template>
 	<div :class="classes" v-bind="$attrs">
-		<div v-if="$slots.prepend" :class="$style.icon">
+		<div v-if="$slots.prepend" data-test-id="card-prepend" :class="$style.icon">
 			<slot name="prepend" />
 		</div>
-		<div :class="$style.content">
+		<div :class="$style.content" data-test-id="card-content">
 			<div v-if="$slots.header" :class="$style.header">
 				<slot name="header" />
 			</div>
@@ -34,7 +34,7 @@ const classes = computed(() => ({
 				<slot name="footer" />
 			</div>
 		</div>
-		<div v-if="$slots.append" :class="$style.append">
+		<div v-if="$slots.append" data-test-id="card-append" :class="$style.append">
 			<slot name="append" />
 		</div>
 	</div>
diff --git a/packages/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap b/packages/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap
index c093867f14..53aed181b8 100644
--- a/packages/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap
+++ b/packages/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`components > N8nCard > should render correctly 1`] = `
 "<div class="card">
   <!--v-if-->
-  <div class="content">
+  <div class="content" data-test-id="card-content">
     <!--v-if-->
     <div class="body">This is a card.</div>
     <!--v-if-->
@@ -15,7 +15,7 @@ exports[`components > N8nCard > should render correctly 1`] = `
 exports[`components > N8nCard > should render correctly with header and footer 1`] = `
 "<div class="card">
   <!--v-if-->
-  <div class="content">
+  <div class="content" data-test-id="card-content">
     <div class="header">Header</div>
     <div class="body">This is a card.</div>
     <div class="footer">Footer</div>
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
index ba905e75cf..1329d9a9ed 100644
--- a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
+++ b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ElMenu, ElSubMenu, ElMenuItem, type MenuItemRegistered } from 'element-plus';
-import { ref, defineProps, defineEmits, defineOptions } from 'vue';
+import { ref } from 'vue';
 import type { RouteLocationRaw } from 'vue-router';
 
 import ConditionalRouterLink from '../ConditionalRouterLink';
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
index 3d32365c4b..b5a37da693 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 
+import { directionsCursorMaps, type Direction, type ResizeData } from 'n8n-design-system/types';
+
 function closestNumber(value: number, divisor: number): number {
 	const q = value / divisor;
 	const n1 = divisor * q;
@@ -21,19 +23,6 @@ function getSize(min: number, virtual: number, gridSize: number): number {
 	return min;
 }
 
-const directionsCursorMaps = {
-	right: 'ew-resize',
-	top: 'ns-resize',
-	bottom: 'ns-resize',
-	left: 'ew-resize',
-	topLeft: 'nw-resize',
-	topRight: 'ne-resize',
-	bottomLeft: 'sw-resize',
-	bottomRight: 'se-resize',
-} as const;
-
-type Direction = keyof typeof directionsCursorMaps;
-
 interface ResizeProps {
 	isResizingEnabled?: boolean;
 	height?: number;
@@ -56,16 +45,6 @@ const props = withDefaults(defineProps<ResizeProps>(), {
 	supportedDirections: () => [],
 });
 
-export interface ResizeData {
-	height: number;
-	width: number;
-	dX: number;
-	dY: number;
-	x: number;
-	y: number;
-	direction: Direction;
-}
-
 const emit = defineEmits<{
 	resizestart: [];
 	resize: [value: ResizeData];
diff --git a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue b/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
index 5219efe2f4..81f74bbe9a 100644
--- a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
+++ b/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
 import { computed, ref, useAttrs } from 'vue';
 
-import N8nResizeWrapper, { type ResizeData } from '../N8nResizeWrapper/ResizeWrapper.vue';
+import { type ResizeData } from 'n8n-design-system/types';
+
+import N8nResizeWrapper from '../N8nResizeWrapper/ResizeWrapper.vue';
 import { defaultStickyProps } from '../N8nSticky/constants';
 import N8nSticky from '../N8nSticky/Sticky.vue';
 import type { StickyProps } from '../N8nSticky/types';
diff --git a/packages/design-system/src/types/index.ts b/packages/design-system/src/types/index.ts
index b532d9e590..ec9f0cdb6d 100644
--- a/packages/design-system/src/types/index.ts
+++ b/packages/design-system/src/types/index.ts
@@ -9,3 +9,4 @@ export * from './select';
 export * from './user';
 export * from './keyboardshortcut';
 export * from './node-creator-node';
+export * from './resize';
diff --git a/packages/design-system/src/types/resize.ts b/packages/design-system/src/types/resize.ts
new file mode 100644
index 0000000000..e2c95ce72a
--- /dev/null
+++ b/packages/design-system/src/types/resize.ts
@@ -0,0 +1,22 @@
+export const directionsCursorMaps = {
+	right: 'ew-resize',
+	top: 'ns-resize',
+	bottom: 'ns-resize',
+	left: 'ew-resize',
+	topLeft: 'nw-resize',
+	topRight: 'ne-resize',
+	bottomLeft: 'sw-resize',
+	bottomRight: 'se-resize',
+} as const;
+
+export type Direction = keyof typeof directionsCursorMaps;
+
+export interface ResizeData {
+	height: number;
+	width: number;
+	dX: number;
+	dY: number;
+	x: number;
+	y: number;
+	direction: Direction;
+}
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 905d0819a1..073440d07c 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.68.0",
+  "version": "1.70.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "scripts": {
@@ -79,6 +79,7 @@
     "vue-json-pretty": "2.2.4",
     "vue-markdown-render": "catalog:frontend",
     "vue-router": "catalog:frontend",
+    "vue-virtual-scroller": "2.0.0-beta.8",
     "vue3-touch-events": "^4.1.3",
     "xss": "catalog:"
   },
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 625e6e7a87..20b7079b6f 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -200,6 +200,7 @@ export interface IStartRunData {
 	startNodes?: StartNodeData[];
 	destinationNode?: string;
 	runData?: IRunData;
+	dirtyNodeNames?: string[];
 }
 
 export interface ITableData {
@@ -1474,6 +1475,7 @@ export interface ExternalSecretsProvider {
 export type CloudUpdateLinkSourceType =
 	| 'advanced-permissions'
 	| 'canvas-nav'
+	| 'concurrency'
 	| 'custom-data-filter'
 	| 'workflow_sharing'
 	| 'credential_sharing'
@@ -1496,6 +1498,7 @@ export type CloudUpdateLinkSourceType =
 export type UTMCampaign =
 	| 'upgrade-custom-data-filter'
 	| 'upgrade-canvas-nav'
+	| 'upgrade-concurrency'
 	| 'upgrade-workflow-sharing'
 	| 'upgrade-credentials-sharing'
 	| 'upgrade-api'
diff --git a/packages/editor-ui/src/__tests__/data/canvas.ts b/packages/editor-ui/src/__tests__/data/canvas.ts
index 10f36dc9ba..f8a58b263a 100644
--- a/packages/editor-ui/src/__tests__/data/canvas.ts
+++ b/packages/editor-ui/src/__tests__/data/canvas.ts
@@ -14,6 +14,7 @@ import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
 import { NodeConnectionType } from 'n8n-workflow';
 import type { EventBus } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system';
+import type { ViewportTransform } from '@vue-flow/core';
 
 export function createCanvasNodeData({
 	id = 'node',
@@ -91,16 +92,22 @@ export function createCanvasNodeProps({
 }
 
 export function createCanvasProvide({
+	initialized = true,
 	isExecuting = false,
 	connectingHandle = undefined,
+	viewport = { x: 0, y: 0, zoom: 1 },
 }: {
+	initialized?: boolean;
 	isExecuting?: boolean;
 	connectingHandle?: ConnectStartEvent;
+	viewport?: ViewportTransform;
 } = {}) {
 	return {
 		[String(CanvasKey)]: {
+			initialized: ref(initialized),
 			isExecuting: ref(isExecuting),
 			connectingHandle: ref(connectingHandle),
+			viewport: ref(viewport),
 		} satisfies CanvasInjectionData,
 	};
 }
@@ -154,6 +161,9 @@ export function createCanvasHandleProvide({
 	isReadOnly?: boolean;
 	isRequired?: boolean;
 } = {}) {
+	const maxConnections = [NodeConnectionType.Main, NodeConnectionType.AiTool].includes(type)
+		? Infinity
+		: 1;
 	return {
 		[String(CanvasNodeHandleKey)]: {
 			label: ref(label),
@@ -164,6 +174,7 @@ export function createCanvasHandleProvide({
 			isConnecting: ref(isConnecting),
 			isReadOnly: ref(isReadOnly),
 			isRequired: ref(isRequired),
+			maxConnections: ref(maxConnections),
 			runData: ref(runData),
 		} satisfies CanvasNodeHandleInjectionData,
 	};
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
index 5746ca5a20..dff54f420f 100644
--- a/packages/editor-ui/src/__tests__/defaults.ts
+++ b/packages/editor-ui/src/__tests__/defaults.ts
@@ -126,4 +126,5 @@ export const defaultSettings: FrontendSettings = {
 		enabled: false,
 	},
 	betaFeatures: [],
+	virtualSchemaView: false,
 };
diff --git a/packages/editor-ui/src/__tests__/render.ts b/packages/editor-ui/src/__tests__/render.ts
index 3bc310f790..08ef303f4f 100644
--- a/packages/editor-ui/src/__tests__/render.ts
+++ b/packages/editor-ui/src/__tests__/render.ts
@@ -80,6 +80,10 @@ export function createComponentRenderer(
 						global: {
 							...defaultOptions.global,
 							...options.global,
+							provide: {
+								...defaultOptions.global?.provide,
+								...options.global?.provide,
+							},
 						},
 					},
 		);
diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts
index 521976b40f..dbf9bdb1ac 100644
--- a/packages/editor-ui/src/__tests__/utils.ts
+++ b/packages/editor-ui/src/__tests__/utils.ts
@@ -136,3 +136,5 @@ export const mockedStore = <TStoreDef extends () => unknown>(
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	return useStore() as any;
 };
+
+export type MockedStore<T extends () => unknown> = ReturnType<typeof mockedStore<T>>;
diff --git a/packages/editor-ui/src/api/testDefinition.ee.ts b/packages/editor-ui/src/api/testDefinition.ee.ts
new file mode 100644
index 0000000000..b6fbf78471
--- /dev/null
+++ b/packages/editor-ui/src/api/testDefinition.ee.ts
@@ -0,0 +1,73 @@
+import type { IRestApiContext } from '@/Interface';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+export interface TestDefinitionRecord {
+	id: string;
+	name: string;
+	workflowId: string;
+	evaluationWorkflowId?: string | null;
+	annotationTagId?: string | null;
+	description?: string | null;
+	updatedAt?: string;
+	createdAt?: string;
+}
+interface CreateTestDefinitionParams {
+	name: string;
+	workflowId: string;
+	evaluationWorkflowId?: string | null;
+}
+
+export interface UpdateTestDefinitionParams {
+	name?: string;
+	evaluationWorkflowId?: string | null;
+	annotationTagId?: string | null;
+	description?: string | null;
+}
+export interface UpdateTestResponse {
+	createdAt: string;
+	updatedAt: string;
+	id: string;
+	name: string;
+	workflowId: string;
+	description: string | null;
+	annotationTag: string | null;
+	evaluationWorkflowId: string | null;
+	annotationTagId: string | null;
+}
+
+const endpoint = '/evaluation/test-definitions';
+
+export async function getTestDefinitions(context: IRestApiContext) {
+	return await makeRestApiRequest<{ count: number; testDefinitions: TestDefinitionRecord[] }>(
+		context,
+		'GET',
+		endpoint,
+	);
+}
+
+export async function getTestDefinition(context: IRestApiContext, id: string) {
+	return await makeRestApiRequest<{ id: string }>(context, 'GET', `${endpoint}/${id}`);
+}
+
+export async function createTestDefinition(
+	context: IRestApiContext,
+	params: CreateTestDefinitionParams,
+) {
+	return await makeRestApiRequest<TestDefinitionRecord>(context, 'POST', endpoint, params);
+}
+
+export async function updateTestDefinition(
+	context: IRestApiContext,
+	id: string,
+	params: UpdateTestDefinitionParams,
+) {
+	return await makeRestApiRequest<UpdateTestResponse>(
+		context,
+		'PATCH',
+		`${endpoint}/${id}`,
+		params,
+	);
+}
+
+export async function deleteTestDefinition(context: IRestApiContext, id: string) {
+	return await makeRestApiRequest<{ success: boolean }>(context, 'DELETE', `${endpoint}/${id}`);
+}
diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
index c93a175a27..362859edee 100644
--- a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
+++ b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
@@ -71,7 +71,7 @@ function onClose() {
 
 <template>
 	<SlideTransition>
-		<n8n-resize-wrapper
+		<N8nResizeWrapper
 			v-show="assistantStore.isAssistantOpen"
 			:supported-directions="['left']"
 			:width="assistantStore.chatWidth"
@@ -97,7 +97,7 @@ function onClose() {
 					@code-undo="undoCodeDiff"
 				/>
 			</div>
-		</n8n-resize-wrapper>
+		</N8nResizeWrapper>
 	</SlideTransition>
 </template>
 
diff --git a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
index 0984d9c7e4..7240dac1e2 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
+++ b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
@@ -5,6 +5,7 @@ import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ParameterInputHint from '@/components/ParameterInputHint.vue';
 import ParameterIssues from '@/components/ParameterIssues.vue';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { isExpression, stringifyExpressionResult } from '@/utils/expressions';
 import type { AssignmentValue, INodeProperties, Result } from 'n8n-workflow';
 import { computed, ref } from 'vue';
@@ -101,7 +102,12 @@ const hint = computed(() => {
 		result = { ok: false, error };
 	}
 
-	return stringifyExpressionResult(result);
+	const hasRunData =
+		!!useWorkflowsStore().workflowExecutionData?.data?.resultData?.runData[
+			ndvStore.activeNode?.name ?? ''
+		];
+
+	return stringifyExpressionResult(result, hasRunData);
 });
 
 const highlightHint = computed(() => Boolean(hint.value && ndvStore.getHoveringItem));
diff --git a/packages/editor-ui/src/components/ButtonParameter.test.ts b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
similarity index 99%
rename from packages/editor-ui/src/components/ButtonParameter.test.ts
rename to packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
index d018e23418..ba5070e335 100644
--- a/packages/editor-ui/src/components/ButtonParameter.test.ts
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
@@ -45,6 +45,7 @@ describe('ButtonParameter', () => {
 		vi.mocked(useNDVStore).mockReturnValue({
 			ndvInputData: [{}],
 			activeNode: { name: 'TestNode', parameters: {} },
+			isDraggableDragging: false,
 		} as any);
 
 		vi.mocked(useWorkflowsStore).mockReturnValue({
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
index 7bce766ea3..a28b68d3dd 100644
--- a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
@@ -6,10 +6,18 @@ import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import { useNDVStore } from '@/stores/ndv.store';
-import { getParentNodes, generateCodeForAiTransform } from './utils';
+import {
+	getParentNodes,
+	generateCodeForAiTransform,
+	type TextareaRowData,
+	getUpdatedTextareaValue,
+	getTextareaCursorPosition,
+} from './utils';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useUIStore } from '@/stores/ui.store';
 
+import { propertyNameFromExpression } from '../../utils/mappingUtils';
+
 const AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT = 'codeGeneratedForPrompt';
 
 const emit = defineEmits<{
@@ -29,6 +37,7 @@ const i18n = useI18n();
 const isLoading = ref(false);
 const prompt = ref(props.value);
 const parentNodes = ref<INodeUi[]>([]);
+const textareaRowsData = ref<TextareaRowData | null>(null);
 
 const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
 const hasInputField = computed(() => props.parameter.typeOptions?.buttonConfig?.hasInputField);
@@ -96,6 +105,7 @@ async function onSubmit() {
 				const updateInformation = await generateCodeForAiTransform(
 					prompt.value,
 					getPath(target as string),
+					5,
 				);
 				if (!updateInformation) return;
 
@@ -159,6 +169,37 @@ function useDarkBackdrop(): string {
 onMounted(() => {
 	parentNodes.value = getParentNodes();
 });
+
+function cleanTextareaRowsData() {
+	textareaRowsData.value = null;
+}
+
+async function onDrop(value: string, event: MouseEvent) {
+	value = propertyNameFromExpression(value);
+
+	prompt.value = getUpdatedTextareaValue(event, textareaRowsData.value, value);
+
+	emit('valueChanged', {
+		name: getPath(props.parameter.name),
+		value: prompt.value,
+	});
+}
+
+async function updateCursorPositionOnMouseMove(event: MouseEvent, activeDrop: boolean) {
+	if (!activeDrop) return;
+
+	const textarea = event.target as HTMLTextAreaElement;
+
+	const position = getTextareaCursorPosition(
+		textarea,
+		textareaRowsData.value,
+		event.clientX,
+		event.clientY,
+	);
+
+	textarea.focus();
+	textarea.setSelectionRange(position, position);
+}
 </script>
 
 <template>
@@ -186,16 +227,25 @@ onMounted(() => {
 					v-text="'Instructions changed'"
 				/>
 			</div>
-			<N8nInput
-				v-model="prompt"
-				:class="$style.input"
-				style="border: 1px solid var(--color-foreground-base)"
-				type="textarea"
-				:rows="6"
-				:maxlength="inputFieldMaxLength"
-				:placeholder="parameter.placeholder"
-				@input="onPromptInput"
-			/>
+			<DraggableTarget type="mapping" :disabled="isLoading" @drop="onDrop">
+				<template #default="{ activeDrop, droppable }">
+					<N8nInput
+						v-model="prompt"
+						:class="[
+							$style.input,
+							{ [$style.activeDrop]: activeDrop, [$style.droppable]: droppable },
+						]"
+						style="border: 1.5px solid var(--color-foreground-base)"
+						type="textarea"
+						:rows="6"
+						:maxlength="inputFieldMaxLength"
+						:placeholder="parameter.placeholder"
+						@input="onPromptInput"
+						@mousemove="updateCursorPositionOnMouseMove($event, activeDrop)"
+						@mouseleave="cleanTextareaRowsData"
+					/>
+				</template>
+			</DraggableTarget>
 		</div>
 		<div :class="$style.controls">
 			<N8nTooltip :disabled="isSubmitEnabled">
@@ -227,7 +277,7 @@ onMounted(() => {
 
 <style module lang="scss">
 .input * {
-	border: 0 !important;
+	border: 1.5px transparent !important;
 }
 .input textarea {
 	font-size: var(--font-size-2xs);
@@ -277,4 +327,11 @@ onMounted(() => {
 	color: var(--color-warning);
 	line-height: 1.2;
 }
+.droppable {
+	border: 1.5px dashed var(--color-ndv-droppable-parameter) !important;
+}
+.activeDrop {
+	border: 1.5px solid var(--color-success) !important;
+	cursor: grabbing;
+}
 </style>
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.test.ts b/packages/editor-ui/src/components/ButtonParameter/utils.test.ts
new file mode 100644
index 0000000000..df7e13d477
--- /dev/null
+++ b/packages/editor-ui/src/components/ButtonParameter/utils.test.ts
@@ -0,0 +1,88 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { generateCodeForAiTransform } from './utils';
+import { createPinia, setActivePinia } from 'pinia';
+import { generateCodeForPrompt } from '@/api/ai';
+
+vi.mock('./utils', async () => {
+	const actual = await vi.importActual('./utils');
+	return {
+		...actual,
+		getSchemas: vi.fn(() => ({
+			parentNodesSchemas: { test: 'parentSchema' },
+			inputSchema: { test: 'inputSchema' },
+		})),
+	};
+});
+
+vi.mock('@/stores/root.store', () => ({
+	useRootStore: () => ({
+		pushRef: 'mockRootPushRef',
+		restApiContext: {},
+	}),
+}));
+
+vi.mock('@/stores/ndv.store', () => ({
+	useNDVStore: () => ({
+		pushRef: 'mockNdvPushRef',
+	}),
+}));
+
+vi.mock('@/stores/settings.store', () => ({
+	useSettingsStore: vi.fn(() => ({ settings: {}, isAskAiEnabled: true })),
+}));
+
+vi.mock('prettier', () => ({
+	format: vi.fn(async (code) => await Promise.resolve(`formatted-${code}`)),
+}));
+
+vi.mock('@/api/ai', () => ({
+	generateCodeForPrompt: vi.fn(),
+}));
+
+describe('generateCodeForAiTransform - Retry Tests', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+		const pinia = createPinia();
+		setActivePinia(pinia);
+	});
+
+	it('should retry and succeed on the second attempt', async () => {
+		const mockGeneratedCode = 'const example = "retry success";';
+
+		vi.mocked(generateCodeForPrompt)
+			.mockRejectedValueOnce(new Error('First attempt failed'))
+			.mockResolvedValueOnce({ code: mockGeneratedCode });
+
+		const result = await generateCodeForAiTransform('test prompt', 'test/path', 2);
+
+		expect(result).toEqual({
+			name: 'test/path',
+			value: 'formatted-const example = "retry success";',
+		});
+		expect(generateCodeForPrompt).toHaveBeenCalledTimes(2);
+	});
+
+	it('should exhaust retries and throw an error', async () => {
+		vi.mocked(generateCodeForPrompt).mockRejectedValue(new Error('All attempts failed'));
+
+		await expect(generateCodeForAiTransform('test prompt', 'test/path', 3)).rejects.toThrow(
+			'All attempts failed',
+		);
+
+		expect(generateCodeForPrompt).toHaveBeenCalledTimes(3);
+	});
+
+	it('should succeed on the first attempt without retries', async () => {
+		const mockGeneratedCode = 'const example = "no retries needed";';
+		vi.mocked(generateCodeForPrompt).mockResolvedValue({ code: mockGeneratedCode });
+
+		const result = await generateCodeForAiTransform('test prompt', 'test/path');
+
+		expect(result).toEqual({
+			name: 'test/path',
+			value: 'formatted-const example = "no retries needed";',
+		});
+		expect(generateCodeForPrompt).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.ts b/packages/editor-ui/src/components/ButtonParameter/utils.ts
index f0b09aec18..b95846975f 100644
--- a/packages/editor-ui/src/components/ButtonParameter/utils.ts
+++ b/packages/editor-ui/src/components/ButtonParameter/utils.ts
@@ -4,14 +4,19 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useDataSchema } from '@/composables/useDataSchema';
 import { executionDataToJson } from '@/utils/nodeTypesUtils';
-import { generateCodeForPrompt } from '../../api/ai';
-import { useRootStore } from '../../stores/root.store';
-import { type AskAiRequest } from '../../types/assistant.types';
-import { useSettingsStore } from '../../stores/settings.store';
+import { generateCodeForPrompt } from '@/api/ai';
+import { useRootStore } from '@/stores/root.store';
+import { type AskAiRequest } from '@/types/assistant.types';
+import { useSettingsStore } from '@/stores/settings.store';
 import { format } from 'prettier';
 import jsParser from 'prettier/plugins/babel';
 import * as estree from 'prettier/plugins/estree';
 
+export type TextareaRowData = {
+	rows: string[];
+	linesToRowsMap: number[][];
+};
+
 export function getParentNodes() {
 	const activeNode = useNDVStore().activeNode;
 	const { getCurrentWorkflow, getNodeByName } = useWorkflowsStore();
@@ -38,7 +43,7 @@ export function getSchemas() {
 
 			return {
 				nodeName: node?.name || '',
-				schema: getSchemaForExecutionData(executionDataToJson(inputData), true),
+				schema: getSchemaForExecutionData(executionDataToJson(inputData), false),
 			};
 		})
 		.filter((node) => node.schema?.value.length > 0);
@@ -52,7 +57,7 @@ export function getSchemas() {
 	};
 }
 
-export async function generateCodeForAiTransform(prompt: string, path: string) {
+export async function generateCodeForAiTransform(prompt: string, path: string, retries = 1) {
 	const schemas = getSchemas();
 
 	const payload: AskAiRequest.RequestPayload = {
@@ -69,7 +74,20 @@ export async function generateCodeForAiTransform(prompt: string, path: string) {
 	let value;
 	if (useSettingsStore().isAskAiEnabled) {
 		const { restApiContext } = useRootStore();
-		const { code } = await generateCodeForPrompt(restApiContext, payload);
+
+		let code = '';
+
+		while (retries > 0) {
+			try {
+				const { code: generatedCode } = await generateCodeForPrompt(restApiContext, payload);
+				code = generatedCode;
+				break;
+			} catch (e) {
+				retries--;
+				if (!retries) throw e;
+			}
+		}
+
 		value = code;
 	} else {
 		throw new ApplicationError('AI code generation is not enabled');
@@ -89,3 +107,164 @@ export async function generateCodeForAiTransform(prompt: string, path: string) {
 
 	return updateInformation;
 }
+
+//------ drag and drop ------
+
+function splitText(textarea: HTMLTextAreaElement, textareaRowsData: TextareaRowData | null) {
+	if (textareaRowsData) return textareaRowsData;
+	const rows: string[] = [];
+	const linesToRowsMap: number[][] = [];
+	const style = window.getComputedStyle(textarea);
+
+	const padding = parseFloat(style.paddingLeft) + parseFloat(style.paddingRight);
+	const border = parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth);
+	const textareaWidth = textarea.clientWidth - padding - border;
+
+	const context = createTextContext(style);
+
+	const lines = textarea.value.split('\n');
+
+	lines.forEach((_) => {
+		linesToRowsMap.push([]);
+	});
+	lines.forEach((line, index) => {
+		if (line === '') {
+			rows.push(line);
+			linesToRowsMap[index].push(rows.length - 1);
+			return;
+		}
+		let currentLine = '';
+		const words = line.split(/(\s+)/);
+
+		words.forEach((word) => {
+			const testLine = currentLine + word;
+			const testWidth = context.measureText(testLine).width;
+
+			if (testWidth <= textareaWidth) {
+				currentLine = testLine;
+			} else {
+				rows.push(currentLine.trimEnd());
+				linesToRowsMap[index].push(rows.length - 1);
+				currentLine = word;
+			}
+		});
+
+		if (currentLine) {
+			rows.push(currentLine.trimEnd());
+			linesToRowsMap[index].push(rows.length - 1);
+		}
+	});
+
+	return { rows, linesToRowsMap };
+}
+
+function createTextContext(style: CSSStyleDeclaration): CanvasRenderingContext2D {
+	const canvas = document.createElement('canvas');
+	const context = canvas.getContext('2d')!;
+	context.font = `${style.fontWeight} ${style.fontSize} ${style.fontFamily}`;
+	return context;
+}
+
+const getRowIndex = (textareaY: number, lineHeight: string) => {
+	const rowHeight = parseInt(lineHeight, 10);
+	const snapPosition = textareaY - rowHeight / 2 - 1;
+	return Math.floor(snapPosition / rowHeight);
+};
+
+const getColumnIndex = (rowText: string, textareaX: number, font: string) => {
+	const span = document.createElement('span');
+	span.style.font = font;
+	span.style.visibility = 'hidden';
+	span.style.position = 'absolute';
+	span.style.whiteSpace = 'pre';
+	document.body.appendChild(span);
+
+	let left = 0;
+	let right = rowText.length;
+	let col = 0;
+
+	while (left <= right) {
+		const mid = Math.floor((left + right) / 2);
+		span.textContent = rowText.substring(0, mid);
+		const width = span.getBoundingClientRect().width;
+
+		if (width <= textareaX) {
+			col = mid;
+			left = mid + 1;
+		} else {
+			right = mid - 1;
+		}
+	}
+
+	document.body.removeChild(span);
+
+	return rowText.length === col ? col : col - 1;
+};
+
+export function getUpdatedTextareaValue(
+	event: MouseEvent,
+	textareaRowsData: TextareaRowData | null,
+	value: string,
+) {
+	const textarea = event.target as HTMLTextAreaElement;
+	const rect = textarea.getBoundingClientRect();
+	const textareaX = event.clientX - rect.left;
+	const textareaY = event.clientY - rect.top;
+	const { lineHeight, font } = window.getComputedStyle(textarea);
+
+	const rowIndex = getRowIndex(textareaY, lineHeight);
+
+	const rowsData = splitText(textarea, textareaRowsData);
+
+	let newText = value;
+
+	if (rowsData.rows[rowIndex] === undefined) {
+		newText = `${textarea.value} ${value}`;
+	}
+	const { rows, linesToRowsMap } = rowsData;
+	const rowText = rows[rowIndex];
+
+	if (rowText === '') {
+		rows[rowIndex] = value;
+	} else {
+		const col = getColumnIndex(rowText, textareaX, font);
+		rows[rowIndex] = [rows[rowIndex].slice(0, col).trim(), value, rows[rowIndex].slice(col).trim()]
+			.join(' ')
+			.trim();
+	}
+
+	newText = linesToRowsMap
+		.map((lineMap) => {
+			return lineMap.map((index) => rows[index]).join(' ');
+		})
+		.join('\n');
+
+	return newText;
+}
+
+export function getTextareaCursorPosition(
+	textarea: HTMLTextAreaElement,
+	textareaRowsData: TextareaRowData | null,
+	clientX: number,
+	clientY: number,
+) {
+	const rect = textarea.getBoundingClientRect();
+	const textareaX = clientX - rect.left;
+	const textareaY = clientY - rect.top;
+	const { lineHeight, font } = window.getComputedStyle(textarea);
+
+	const rowIndex = getRowIndex(textareaY, lineHeight);
+	const { rows } = splitText(textarea, textareaRowsData);
+
+	if (rowIndex < 0 || rowIndex >= rows.length) {
+		return textarea.value.length;
+	}
+
+	const rowText = rows[rowIndex];
+
+	const col = getColumnIndex(rowText, textareaX, font);
+
+	const position = rows.slice(0, rowIndex).reduce((acc, curr) => acc + curr.length + 1, 0) + col;
+
+	return position;
+}
diff --git a/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts b/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
index 9dd9fb3f66..47869583a4 100644
--- a/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
+++ b/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
@@ -4,6 +4,7 @@ import { waitFor } from '@testing-library/vue';
 import { userEvent } from '@testing-library/user-event';
 import { createRouter, createWebHistory } from 'vue-router';
 import { computed, ref } from 'vue';
+import type { INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
 import CanvasChat from './CanvasChat.vue';
@@ -15,7 +16,6 @@ import { ChatOptionsSymbol, ChatSymbol } from '@n8n/chat/constants';
 import { chatEventBus } from '@n8n/chat/event-buses';
 
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useUIStore } from '@/stores/ui.store';
 import { useCanvasStore } from '@/stores/canvas.store';
 import * as useChatMessaging from './composables/useChatMessaging';
 import * as useChatTrigger from './composables/useChatTrigger';
@@ -23,6 +23,7 @@ import { useToast } from '@/composables/useToast';
 
 import type { IExecutionResponse, INodeUi } from '@/Interface';
 import type { ChatMessage } from '@n8n/chat/types';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 
 vi.mock('@/composables/useToast', () => {
 	const showMessage = vi.fn();
@@ -61,6 +62,26 @@ const mockNodes: INodeUi[] = [
 		position: [960, 860],
 	},
 ];
+const mockNodeTypes: INodeTypeDescription[] = [
+	{
+		displayName: 'AI Agent',
+		name: '@n8n/n8n-nodes-langchain.agent',
+		properties: [],
+		defaults: {
+			name: 'AI Agent',
+		},
+		inputs: [NodeConnectionType.Main],
+		outputs: [NodeConnectionType.Main],
+		version: 0,
+		group: [],
+		description: '',
+		codex: {
+			subcategories: {
+				AI: ['Agents'],
+			},
+		},
+	},
+];
 
 const mockConnections = {
 	'When chat message received': {
@@ -110,8 +131,8 @@ describe('CanvasChat', () => {
 	});
 
 	let workflowsStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
-	let uiStore: ReturnType<typeof mockedStore<typeof useUIStore>>;
 	let canvasStore: ReturnType<typeof mockedStore<typeof useCanvasStore>>;
+	let nodeTypeStore: ReturnType<typeof mockedStore<typeof useNodeTypesStore>>;
 
 	beforeEach(() => {
 		const pinia = createTestingPinia({
@@ -131,8 +152,8 @@ describe('CanvasChat', () => {
 		setActivePinia(pinia);
 
 		workflowsStore = mockedStore(useWorkflowsStore);
-		uiStore = mockedStore(useUIStore);
 		canvasStore = mockedStore(useCanvasStore);
+		nodeTypeStore = mockedStore(useNodeTypesStore);
 
 		// Setup default mocks
 		workflowsStore.getCurrentWorkflow.mockReturnValue(
@@ -141,12 +162,21 @@ describe('CanvasChat', () => {
 				connections: mockConnections,
 			}),
 		);
-		workflowsStore.getNodeByName.mockImplementation(
-			(name) => mockNodes.find((node) => node.name === name) ?? null,
-		);
+		workflowsStore.getNodeByName.mockImplementation((name) => {
+			const matchedNode = mockNodes.find((node) => node.name === name) ?? null;
+
+			return matchedNode;
+		});
 		workflowsStore.isChatPanelOpen = true;
+		workflowsStore.isLogsPanelOpen = true;
 		workflowsStore.getWorkflowExecution = mockWorkflowExecution as unknown as IExecutionResponse;
 		workflowsStore.getPastChatMessages = ['Previous message 1', 'Previous message 2'];
+
+		nodeTypeStore.getNodeType = vi.fn().mockImplementation((nodeTypeName) => {
+			return mockNodeTypes.find((node) => node.name === nodeTypeName) ?? null;
+		});
+
+		workflowsStore.runWorkflow.mockResolvedValue({ executionId: 'test-execution-issd' });
 	});
 
 	afterEach(() => {
@@ -190,6 +220,10 @@ describe('CanvasChat', () => {
 			// Verify message and response
 			expect(await findByText('Hello AI!')).toBeInTheDocument();
 			await waitFor(async () => {
+				workflowsStore.getWorkflowExecution = {
+					...(mockWorkflowExecution as unknown as IExecutionResponse),
+					status: 'success',
+				};
 				expect(await findByText('AI response message')).toBeInTheDocument();
 			});
 
@@ -231,11 +265,12 @@ describe('CanvasChat', () => {
 			await userEvent.type(input, 'Test message');
 			await userEvent.keyboard('{Enter}');
 
-			// Verify loading states
-			uiStore.isActionActive = { workflowRunning: true };
 			await waitFor(() => expect(queryByTestId('chat-message-typing')).toBeInTheDocument());
 
-			uiStore.isActionActive = { workflowRunning: false };
+			workflowsStore.getWorkflowExecution = {
+				...(mockWorkflowExecution as unknown as IExecutionResponse),
+				status: 'success',
+			};
 			await waitFor(() => expect(queryByTestId('chat-message-typing')).not.toBeInTheDocument());
 		});
 
@@ -269,7 +304,7 @@ describe('CanvasChat', () => {
 				sendMessage: vi.fn(),
 				extractResponseMessage: vi.fn(),
 				previousMessageIndex: ref(0),
-				waitForExecution: vi.fn(),
+				isLoading: computed(() => false),
 			});
 		});
 
@@ -339,7 +374,7 @@ describe('CanvasChat', () => {
 				sendMessage: vi.fn(),
 				extractResponseMessage: vi.fn(),
 				previousMessageIndex: ref(0),
-				waitForExecution: vi.fn(),
+				isLoading: computed(() => false),
 			});
 
 			workflowsStore.isChatPanelOpen = true;
@@ -437,7 +472,7 @@ describe('CanvasChat', () => {
 				sendMessage: sendMessageSpy,
 				extractResponseMessage: vi.fn(),
 				previousMessageIndex: ref(0),
-				waitForExecution: vi.fn(),
+				isLoading: computed(() => false),
 			});
 			workflowsStore.messages = mockMessages;
 		});
@@ -449,26 +484,25 @@ describe('CanvasChat', () => {
 			await userEvent.click(repostButton);
 
 			expect(sendMessageSpy).toHaveBeenCalledWith('Original message');
-			//   expect.objectContaining({
-			//     runData: expect.objectContaining({
-			//       'When chat message received': expect.arrayContaining([
-			//         expect.objectContaining({
-			//           data: expect.objectContaining({
-			//             main: expect.arrayContaining([
-			//               expect.arrayContaining([
-			//                 expect.objectContaining({
-			//                   json: expect.objectContaining({
-			//                     chatInput: 'Original message',
-			//                   }),
-			//                 }),
-			//               ]),
-			//             ]),
-			//           }),
-			//         }),
-			//       ]),
-			//     }),
-			//   }),
-			// );
+			expect.objectContaining({
+				runData: expect.objectContaining({
+					'When chat message received': expect.arrayContaining([
+						expect.objectContaining({
+							data: expect.objectContaining({
+								main: expect.arrayContaining([
+									expect.arrayContaining([
+										expect.objectContaining({
+											json: expect.objectContaining({
+												chatInput: 'Original message',
+											}),
+										}),
+									]),
+								]),
+							}),
+						}),
+					]),
+				}),
+			});
 		});
 
 		it('should show message options only for appropriate messages', async () => {
@@ -494,32 +528,6 @@ describe('CanvasChat', () => {
 		});
 	});
 
-	describe('execution handling', () => {
-		it('should update UI when execution is completed', async () => {
-			const { findByTestId, queryByTestId } = renderComponent();
-
-			// Start execution
-			const input = await findByTestId('chat-input');
-			await userEvent.type(input, 'Test message');
-			await userEvent.keyboard('{Enter}');
-
-			// Simulate execution completion
-			uiStore.isActionActive = { workflowRunning: true };
-			await waitFor(() => {
-				expect(queryByTestId('chat-message-typing')).toBeInTheDocument();
-			});
-
-			uiStore.isActionActive = { workflowRunning: false };
-			workflowsStore.setWorkflowExecutionData(
-				mockWorkflowExecution as unknown as IExecutionResponse,
-			);
-
-			await waitFor(() => {
-				expect(queryByTestId('chat-message-typing')).not.toBeInTheDocument();
-			});
-		});
-	});
-
 	describe('panel state synchronization', () => {
 		it('should update canvas height when chat or logs panel state changes', async () => {
 			renderComponent();
diff --git a/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue b/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
index 51bf1bf8be..7b27cf4b3d 100644
--- a/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
+++ b/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
@@ -25,11 +25,9 @@ import type { Chat, ChatMessage, ChatOptions } from '@n8n/chat/types';
 import type { RunWorkflowChatPayload } from './composables/useChatMessaging';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCanvasStore } from '@/stores/canvas.store';
-import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 
 const workflowsStore = useWorkflowsStore();
-const uiStore = useUIStore();
 const canvasStore = useCanvasStore();
 const nodeTypesStore = useNodeTypesStore();
 const nodeHelpers = useNodeHelpers();
@@ -43,10 +41,7 @@ const container = ref<HTMLElement>();
 
 // Computed properties
 const workflow = computed(() => workflowsStore.getCurrentWorkflow());
-const isLoading = computed(() => {
-	const result = uiStore.isActionActive.workflowRunning;
-	return result;
-});
+
 const allConnections = computed(() => workflowsStore.allConnections);
 const isChatOpen = computed(() => {
 	const result = workflowsStore.isChatPanelOpen;
@@ -55,34 +50,38 @@ const isChatOpen = computed(() => {
 const canvasNodes = computed(() => workflowsStore.allNodes);
 const isLogsOpen = computed(() => workflowsStore.isLogsPanelOpen);
 const previousChatMessages = computed(() => workflowsStore.getPastChatMessages);
-
+const resultData = computed(() => workflowsStore.getWorkflowRunData);
 // Expose internal state for testing
 defineExpose({
 	messages,
 	currentSessionId,
 	isDisabled,
 	workflow,
-	isLoading,
 });
 
 const { runWorkflow } = useRunWorkflow({ router });
 
 // Initialize features with injected dependencies
-const { chatTriggerNode, connectedNode, allowFileUploads, setChatTriggerNode, setConnectedNode } =
-	useChatTrigger({
-		workflow,
-		canvasNodes,
-		getNodeByName: workflowsStore.getNodeByName,
-		getNodeType: nodeTypesStore.getNodeType,
-	});
+const {
+	chatTriggerNode,
+	connectedNode,
+	allowFileUploads,
+	allowedFilesMimeTypes,
+	setChatTriggerNode,
+	setConnectedNode,
+} = useChatTrigger({
+	workflow,
+	canvasNodes,
+	getNodeByName: workflowsStore.getNodeByName,
+	getNodeType: nodeTypesStore.getNodeType,
+});
 
-const { sendMessage, getChatMessages } = useChatMessaging({
+const { sendMessage, getChatMessages, isLoading } = useChatMessaging({
 	chatTrigger: chatTriggerNode,
 	connectedNode,
 	messages,
 	sessionId: currentSessionId,
 	workflow,
-	isLoading,
 	executionResultData: computed(() => workflowsStore.getWorkflowExecution?.data?.resultData),
 	getWorkflowResultDataByNodeName: workflowsStore.getWorkflowResultDataByNodeName,
 	onRunChatWorkflow,
@@ -132,7 +131,7 @@ function createChatConfig(params: {
 		showWindowCloseButton: true,
 		disabled: params.isDisabled,
 		allowFileUploads: params.allowFileUploads,
-		allowedFilesMimeTypes: '',
+		allowedFilesMimeTypes,
 	};
 
 	return { chatConfig, chatOptions };
@@ -173,15 +172,50 @@ const closePanel = () => {
 	workflowsStore.setPanelOpen('chat', false);
 };
 
-async function onRunChatWorkflow(payload: RunWorkflowChatPayload) {
-	const response = await runWorkflow({
-		triggerNode: payload.triggerNode,
-		nodeData: payload.nodeData,
-		source: payload.source,
+// This function creates a promise that resolves when the workflow execution completes
+// It's used to handle the loading state while waiting for the workflow to finish
+async function createExecutionPromise() {
+	let resolvePromise: () => void;
+	const promise = new Promise<void>((resolve) => {
+		resolvePromise = resolve;
 	});
 
-	workflowsStore.appendChatMessage(payload.message);
-	return response;
+	// Watch for changes in the workflow execution status
+	const stopWatch = watch(
+		() => workflowsStore.getWorkflowExecution?.status,
+		(newStatus) => {
+			// If the status is no longer 'running', resolve the promise
+			if (newStatus && newStatus !== 'running') {
+				resolvePromise();
+				// Stop the watcher when the promise is resolved
+				stopWatch();
+			}
+		},
+		{ immediate: true }, // Check the status immediately when the watcher is set up
+	);
+
+	// Return the promise, which will resolve when the workflow execution is complete
+	// This allows the caller to await the execution and handle the loading state appropriately
+	return await promise;
+}
+
+async function onRunChatWorkflow(payload: RunWorkflowChatPayload) {
+	try {
+		const response = await runWorkflow({
+			triggerNode: payload.triggerNode,
+			nodeData: payload.nodeData,
+			source: payload.source,
+		});
+
+		if (response) {
+			await createExecutionPromise();
+			workflowsStore.appendChatMessage(payload.message);
+			return response;
+		}
+		return;
+	} catch (error) {
+		throw error;
+	}
 }
 
 // Initialize chat config
@@ -240,7 +274,7 @@ watchEffect(() => {
 </script>
 
 <template>
-	<n8n-resize-wrapper
+	<N8nResizeWrapper
 		v-if="chatTriggerNode"
 		:is-resizing-enabled="isChatOpen || isLogsOpen"
 		:supported-directions="['top']"
@@ -264,6 +298,8 @@ watchEffect(() => {
 							:messages="messages"
 							:session-id="currentSessionId"
 							:past-chat-messages="previousChatMessages"
+							:show-close-button="!connectedNode"
+							@close="closePanel"
 							@refresh-session="handleRefreshSession"
 							@display-execution="handleDisplayExecution"
 							@send-message="sendMessage"
@@ -272,7 +308,7 @@ watchEffect(() => {
 				</n8n-resize-wrapper>
 				<div v-if="isLogsOpen && connectedNode" :class="$style.logs">
 					<ChatLogsPanel
-						:key="messages.length"
+						:key="`${resultData?.length ?? messages?.length}`"
 						:workflow="workflow"
 						data-test-id="canvas-chat-logs"
 						:node="connectedNode"
@@ -282,7 +318,7 @@ watchEffect(() => {
 				</div>
 			</div>
 		</div>
-	</n8n-resize-wrapper>
+	</N8nResizeWrapper>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue b/packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue
index 9e5fb15567..d0c20af6a9 100644
--- a/packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue
+++ b/packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue
@@ -17,6 +17,7 @@ interface Props {
 	pastChatMessages: string[];
 	messages: ChatMessage[];
 	sessionId: string;
+	showCloseButton?: boolean;
 }
 
 const props = defineProps<Props>();
@@ -25,6 +26,7 @@ const emit = defineEmits<{
 	displayExecution: [id: string];
 	sendMessage: [message: string];
 	refreshSession: [];
+	close: [];
 }>();
 
 const messageComposable = useMessage();
@@ -142,7 +144,7 @@ function copySessionId() {
 <template>
 	<div :class="$style.chat" data-test-id="workflow-lm-chat-dialog">
 		<header :class="$style.chatHeader">
-			<span>{{ locale.baseText('chat.window.title') }}</span>
+			<span :class="$style.chatTitle">{{ locale.baseText('chat.window.title') }}</span>
 			<div :class="$style.session">
 				<span>{{ locale.baseText('chat.window.session.title') }}</span>
 				<n8n-tooltip placement="left">
@@ -154,15 +156,24 @@ function copySessionId() {
 					}}</span>
 				</n8n-tooltip>
 				<n8n-icon-button
-					:class="$style.refreshSession"
+					:class="$style.headerButton"
 					data-test-id="refresh-session-button"
-					type="tertiary"
-					text
+					outline
+					type="secondary"
 					size="mini"
 					icon="undo"
 					:title="locale.baseText('chat.window.session.reset.confirm')"
 					@click="onRefreshSession"
 				/>
+				<n8n-icon-button
+					v-if="showCloseButton"
+					:class="$style.headerButton"
+					outline
+					type="secondary"
+					size="mini"
+					icon="times"
+					@click="emit('close')"
+				/>
 			</div>
 		</header>
 		<main :class="$style.chatBody">
@@ -199,29 +210,32 @@ function copySessionId() {
 		</main>
 
 		<div :class="$style.messagesInput">
-			<div v-if="pastChatMessages.length > 0" :class="$style.messagesHistory">
-				<n8n-button
-					title="Navigate to previous message"
-					icon="chevron-up"
-					type="tertiary"
-					text
-					size="mini"
-					@click="onArrowKeyDown({ currentInputValue: '', key: 'ArrowUp' })"
-				/>
-				<n8n-button
-					title="Navigate to next message"
-					icon="chevron-down"
-					type="tertiary"
-					text
-					size="mini"
-					@click="onArrowKeyDown({ currentInputValue: '', key: 'ArrowDown' })"
-				/>
-			</div>
 			<ChatInput
 				data-test-id="lm-chat-inputs"
 				:placeholder="inputPlaceholder"
 				@arrow-key-down="onArrowKeyDown"
-			/>
+			>
+				<template v-if="pastChatMessages.length > 0" #leftPanel>
+					<div :class="$style.messagesHistory">
+						<n8n-button
+							title="Navigate to previous message"
+							icon="chevron-up"
+							type="tertiary"
+							text
+							size="mini"
+							@click="onArrowKeyDown({ currentInputValue: '', key: 'ArrowUp' })"
+						/>
+						<n8n-button
+							title="Navigate to next message"
+							icon="chevron-down"
+							type="tertiary"
+							text
+							size="mini"
+							@click="onArrowKeyDown({ currentInputValue: '', key: 'ArrowDown' })"
+						/>
+					</div>
+				</template>
+			</ChatInput>
 		</div>
 	</div>
 </template>
@@ -229,19 +243,22 @@ function copySessionId() {
 <style lang="scss" module>
 .chat {
 	--chat--spacing: var(--spacing-xs);
-	--chat--message--padding: var(--spacing-xs);
-	--chat--message--font-size: var(--font-size-s);
+	--chat--message--padding: var(--spacing-2xs);
+	--chat--message--font-size: var(--font-size-xs);
 	--chat--input--font-size: var(--font-size-s);
+	--chat--input--placeholder--font-size: var(--font-size-xs);
 	--chat--message--bot--background: transparent;
 	--chat--message--user--background: var(--color-text-lighter);
 	--chat--message--bot--color: var(--color-text-dark);
 	--chat--message--user--color: var(--color-text-dark);
 	--chat--message--bot--border: none;
 	--chat--message--user--border: none;
+	--chat--message--user--border: none;
+	--chat--input--padding: var(--spacing-xs);
 	--chat--color-typing: var(--color-text-light);
-	--chat--textarea--max-height: calc(var(--panel-height) * 0.5);
+	--chat--textarea--max-height: calc(var(--panel-height) * 0.3);
 	--chat--message--pre--background: var(--color-foreground-light);
-
+	--chat--textarea--height: 2.5rem;
 	height: 100%;
 	display: flex;
 	flex-direction: column;
@@ -260,6 +277,9 @@ function copySessionId() {
 	justify-content: space-between;
 	align-items: center;
 }
+.chatTitle {
+	font-weight: 600;
+}
 .session {
 	display: flex;
 	align-items: center;
@@ -275,8 +295,9 @@ function copySessionId() {
 
 	cursor: pointer;
 }
-.refreshSession {
+.headerButton {
 	max-height: 1.1rem;
+	border: none;
 }
 .chatBody {
 	display: flex;
@@ -306,7 +327,7 @@ function copySessionId() {
 	--chat--input--file--button--background: transparent;
 	--chat--input--file--button--color: var(--color-primary);
 	--chat--input--border-active: var(--input-focus-border-color, var(--color-secondary));
-	--chat--files-spacing: var(--spacing-2xs) 0;
+	--chat--files-spacing: var(--spacing-2xs);
 	--chat--input--background: transparent;
 	--chat--input--file--button--color: var(--color-button-secondary-font);
 	--chat--input--file--button--color-hover: var(--color-primary);
@@ -318,7 +339,7 @@ function copySessionId() {
 		--chat--input--text-color: var(--input-font-color, var(--color-text-dark));
 	}
 
-	padding: 0 0 0 var(--spacing-xs);
+	padding: var(--spacing-5xs);
 	margin: 0 var(--chat--spacing) var(--chat--spacing);
 	flex-grow: 1;
 	display: flex;
@@ -333,16 +354,4 @@ function copySessionId() {
 		--input-border-color: #4538a3;
 	}
 }
-
-.messagesHistory {
-	display: flex;
-	flex-direction: column;
-	justify-content: flex-end;
-	margin-bottom: var(--spacing-3xs);
-
-	button:first-child {
-		margin-top: var(--spacing-4xs);
-		margin-bottom: calc(-1 * var(--spacing-4xs));
-	}
-}
 </style>
diff --git a/packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts b/packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts
index 2ceec6b54d..4f09135b20 100644
--- a/packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts
+++ b/packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts
@@ -1,5 +1,5 @@
 import type { ComputedRef, Ref } from 'vue';
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 import { v4 as uuid } from 'uuid';
 import type { ChatMessage, ChatMessageText } from '@n8n/chat/types';
 import { NodeConnectionType, CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow';
@@ -34,7 +34,6 @@ export interface ChatMessagingDependencies {
 	messages: Ref<ChatMessage[]>;
 	sessionId: Ref<string>;
 	workflow: ComputedRef<Workflow>;
-	isLoading: ComputedRef<boolean>;
 	executionResultData: ComputedRef<IRunExecutionData['resultData'] | undefined>;
 	getWorkflowResultDataByNodeName: (nodeName: string) => ITaskData[] | null;
 	onRunChatWorkflow: (
@@ -48,7 +47,6 @@ export function useChatMessaging({
 	messages,
 	sessionId,
 	workflow,
-	isLoading,
 	executionResultData,
 	getWorkflowResultDataByNodeName,
 	onRunChatWorkflow,
@@ -56,6 +54,7 @@ export function useChatMessaging({
 	const locale = useI18n();
 	const { showError } = useToast();
 	const previousMessageIndex = ref(0);
+	const isLoading = ref(false);
 
 	/** Converts a file to binary data */
 	async function convertFileToBinaryData(file: File): Promise<IBinaryData> {
@@ -147,57 +146,45 @@ export function useChatMessaging({
 			},
 			source: [null],
 		};
-
+		isLoading.value = true;
 		const response = await onRunChatWorkflow({
 			triggerNode: triggerNode.name,
 			nodeData,
 			source: 'RunData.ManualChatMessage',
 			message,
 		});
-
+		isLoading.value = false;
 		if (!response?.executionId) {
-			showError(
-				new Error('It was not possible to start workflow!'),
-				'Workflow could not be started',
-			);
 			return;
 		}
 
-		waitForExecution(response.executionId);
+		processExecutionResultData(response.executionId);
 	}
 
-	/** Waits for workflow execution to complete */
-	function waitForExecution(executionId: string) {
-		const waitInterval = setInterval(() => {
-			if (!isLoading.value) {
-				clearInterval(waitInterval);
+	function processExecutionResultData(executionId: string) {
+		const lastNodeExecuted = executionResultData.value?.lastNodeExecuted;
 
-				const lastNodeExecuted = executionResultData.value?.lastNodeExecuted;
+		if (!lastNodeExecuted) return;
 
-				if (!lastNodeExecuted) return;
+		const nodeResponseDataArray = get(executionResultData.value.runData, lastNodeExecuted) ?? [];
 
-				const nodeResponseDataArray =
-					get(executionResultData.value.runData, lastNodeExecuted) ?? [];
+		const nodeResponseData = nodeResponseDataArray[nodeResponseDataArray.length - 1];
 
-				const nodeResponseData = nodeResponseDataArray[nodeResponseDataArray.length - 1];
+		let responseMessage: string;
 
-				let responseMessage: string;
-
-				if (get(nodeResponseData, 'error')) {
-					responseMessage = '[ERROR: ' + get(nodeResponseData, 'error.message') + ']';
-				} else {
-					const responseData = get(nodeResponseData, 'data.main[0][0].json');
-					responseMessage = extractResponseMessage(responseData);
-				}
-
-				messages.value.push({
-					text: responseMessage,
-					sender: 'bot',
-					createdAt: new Date().toISOString(),
-					id: executionId ?? uuid(),
-				});
-			}
-		}, 500);
+		if (get(nodeResponseData, 'error')) {
+			responseMessage = '[ERROR: ' + get(nodeResponseData, 'error.message') + ']';
+		} else {
+			const responseData = get(nodeResponseData, 'data.main[0][0].json');
+			responseMessage = extractResponseMessage(responseData);
+		}
+		isLoading.value = false;
+		messages.value.push({
+			text: responseMessage,
+			sender: 'bot',
+			createdAt: new Date().toISOString(),
+			id: executionId ?? uuid(),
+		});
 	}
 
 	/** Extracts response message from workflow output */
@@ -291,9 +278,9 @@ export function useChatMessaging({
 
 	return {
 		previousMessageIndex,
+		isLoading: computed(() => isLoading.value),
 		sendMessage,
 		extractResponseMessage,
-		waitForExecution,
 		getChatMessages,
 	};
 }
diff --git a/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts b/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts
index cdbfcb82c2..273cf4cf03 100644
--- a/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts
+++ b/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts
@@ -1,9 +1,9 @@
 import type { Ref } from 'vue';
 import { ref, computed, onMounted, onBeforeUnmount, watchEffect } from 'vue';
-import type { ResizeData } from 'n8n-design-system/components/N8nResizeWrapper/ResizeWrapper.vue';
 import { useDebounce } from '@/composables/useDebounce';
 import type { IChatResizeStyles } from '../types/chat';
 import { useStorage } from '@/composables/useStorage';
+import { type ResizeData } from 'n8n-design-system';
 
 const LOCAL_STORAGE_PANEL_HEIGHT = 'N8N_CANVAS_CHAT_HEIGHT';
 const LOCAL_STORAGE_PANEL_WIDTH = 'N8N_CANVAS_CHAT_WIDTH';
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/utils.test.ts b/packages/editor-ui/src/components/CodeNodeEditor/utils.test.ts
new file mode 100644
index 0000000000..a821403e4c
--- /dev/null
+++ b/packages/editor-ui/src/components/CodeNodeEditor/utils.test.ts
@@ -0,0 +1,44 @@
+import * as esprima from 'esprima-next';
+import { walk } from './utils';
+
+describe('CodeNodeEditor utils', () => {
+	describe('walk', () => {
+		it('should find the correct syntax nodes', () => {
+			const code = `const x = 'a'
+function f(arg) {
+   arg['b'] = 1
+   return arg
+}
+
+const y = f({ a: 'c' })
+`;
+			const program = esprima.parse(code);
+			const stringLiterals = walk(
+				program,
+				(node) => node.type === esprima.Syntax.Literal && typeof node.value === 'string',
+			);
+			expect(stringLiterals).toEqual([
+				new esprima.Literal('a', "'a'"),
+				new esprima.Literal('b', "'b'"),
+				new esprima.Literal('c', "'c'"),
+			]);
+		});
+
+		it('should handle null syntax nodes', () => {
+			// ,, in [1,,2] results in a `null` ArrayExpressionElement
+			const code = 'const fn = () => [1,,2]';
+			const program = esprima.parse(code);
+			const arrayExpressions = walk(
+				program,
+				(node) => node.type === esprima.Syntax.ArrayExpression,
+			);
+			expect(arrayExpressions).toEqual([
+				new esprima.ArrayExpression([
+					new esprima.Literal(1, '1'),
+					null,
+					new esprima.Literal(2, '2'),
+				]),
+			]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/utils.ts b/packages/editor-ui/src/components/CodeNodeEditor/utils.ts
index d37bc87648..e75dfa927a 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/utils.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/utils.ts
@@ -1,29 +1,33 @@
-import type * as esprima from 'esprima-next';
+import * as esprima from 'esprima-next';
 import type { Completion } from '@codemirror/autocomplete';
-import type { Node } from 'estree';
 import type { RangeNode } from './types';
 import { sanitizeHtml } from '@/utils/htmlUtils';
+import type { Node } from 'estree';
 
 export function walk<T extends RangeNode>(
 	node: Node | esprima.Program,
 	test: (node: Node) => boolean,
 	found: Node[] = [],
 ) {
-	// @ts-ignore
-	if (test(node)) found.push(node);
+	const isProgram = node.type === esprima.Syntax.Program;
+	if (!isProgram && test(node)) found.push(node);
 
-	for (const key in node) {
-		if (!(key in node)) continue;
+	if (isProgram) {
+		node.body.forEach((n) => walk(n as Node, test, found));
+	} else {
+		for (const key in node) {
+			if (!(key in node)) continue;
 
-		// @ts-ignore
-		const child = node[key];
+			// @ts-expect-error Node is not string indexable, but it has many possible properties
+			const child = node[key];
 
-		if (child === null || typeof child !== 'object') continue;
+			if (child === null || typeof child !== 'object') continue;
 
-		if (Array.isArray(child)) {
-			child.forEach((node) => walk(node, test, found));
-		} else {
-			walk(child, test, found);
+			if (Array.isArray(child)) {
+				child.filter(Boolean).forEach((n) => walk(n, test, found));
+			} else {
+				walk(child, test, found);
+			}
 		}
 	}
 
diff --git a/packages/editor-ui/src/components/ExpressionEditModal.vue b/packages/editor-ui/src/components/ExpressionEditModal.vue
index 9fe4c17377..e1f7309a71 100644
--- a/packages/editor-ui/src/components/ExpressionEditModal.vue
+++ b/packages/editor-ui/src/components/ExpressionEditModal.vue
@@ -23,6 +23,10 @@ import { dropInExpressionEditor } from '@/plugins/codemirror/dragAndDrop';
 
 import { APP_MODALS_ELEMENT_ID } from '@/constants';
 import { N8nInput, N8nText } from 'n8n-design-system';
+import { N8nResizeWrapper, type ResizeData } from 'n8n-design-system';
+import { useThrottleFn } from '@vueuse/core';
+
+const DEFAULT_LEFT_SIDEBAR_WIDTH = 360;
 
 type Props = {
 	parameter: INodeProperties;
@@ -56,6 +60,7 @@ const { debounce } = useDebounce();
 const segments = ref<Segment[]>([]);
 const search = ref('');
 const appliedSearch = ref('');
+const sidebarWidth = ref(DEFAULT_LEFT_SIDEBAR_WIDTH);
 const expressionInputRef = ref<InstanceType<typeof ExpressionEditorModalInput>>();
 const expressionResultRef = ref<InstanceType<typeof ExpressionOutput>>();
 const theme = outputTheme();
@@ -122,6 +127,12 @@ async function onDrop(expression: string, event: MouseEvent) {
 
 	await dropInExpressionEditor(toRaw(inputEditor.value), event, expression);
 }
+
+function onResize(event: ResizeData) {
+	sidebarWidth.value = event.width;
+}
+
+const onResizeThrottle = useThrottleFn(onResize, 10);
 </script>
 
 <template>
@@ -136,28 +147,37 @@ async function onDrop(expression: string, event: MouseEvent) {
 			<Close height="18" width="18" />
 		</button>
 		<div :class="$style.container">
-			<div :class="$style.sidebar">
-				<N8nInput
-					v-model="search"
-					size="small"
-					:class="$style.search"
-					:placeholder="i18n.baseText('ndv.search.placeholder.input.schema')"
-				>
-					<template #prefix>
-						<N8nIcon :class="$style.ioSearchIcon" icon="search" />
-					</template>
-				</N8nInput>
+			<N8nResizeWrapper
+				:width="sidebarWidth"
+				:min-width="200"
+				:style="{ width: `${sidebarWidth}px` }"
+				:grid-size="8"
+				:supported-directions="['left', 'right']"
+				@resize="onResizeThrottle"
+			>
+				<div :class="$style.sidebar">
+					<N8nInput
+						v-model="search"
+						size="small"
+						:class="$style.search"
+						:placeholder="i18n.baseText('ndv.search.placeholder.input.schema')"
+					>
+						<template #prefix>
+							<N8nIcon :class="$style.ioSearchIcon" icon="search" />
+						</template>
+					</N8nInput>
 
-				<RunDataSchema
-					:class="$style.schema"
-					:search="appliedSearch"
-					:nodes="parentNodes"
-					:mapping-enabled="!isReadOnly"
-					:connection-type="NodeConnectionType.Main"
-					pane-type="input"
-					context="modal"
-				/>
-			</div>
+					<RunDataSchema
+						:class="$style.schema"
+						:search="appliedSearch"
+						:nodes="parentNodes"
+						:mapping-enabled="!isReadOnly"
+						:connection-type="NodeConnectionType.Main"
+						pane-type="input"
+						context="modal"
+					/>
+				</div>
+			</N8nResizeWrapper>
 
 			<div :class="$style.io">
 				<div :class="$style.input">
@@ -239,7 +259,7 @@ async function onDrop(expression: string, event: MouseEvent) {
 .container {
 	display: flex;
 	flex-flow: row nowrap;
-	gap: var(--spacing-s);
+	gap: var(--spacing-2xs);
 	height: 100%;
 }
 
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index 70c1abc78c..bae21c58fe 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -114,7 +114,7 @@ defineExpose({ editor });
 	:global(.cm-content) {
 		border-radius: var(--border-radius-base);
 		&[aria-readonly='true'] {
-			--disabled-fill: var(--color-background-medium);
+			--disabled-fill: var(--color-background-base);
 			background-color: var(--disabled-fill, var(--color-background-light));
 			color: var(--disabled-color, var(--color-text-base));
 			cursor: not-allowed;
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 643af5980c..593a0aa028 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -134,7 +134,7 @@ defineExpose({
 	padding-left: 0;
 }
 :deep(.cm-content) {
-	--disabled-fill: var(--color-background-medium);
+	--disabled-fill: var(--color-background-base);
 	padding-left: var(--spacing-2xs);
 
 	&[aria-readonly='true'] {
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index a3ddc8ed64..2dab3ea97b 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -145,7 +145,7 @@ const isExecutingPrevious = computed(() => {
 	if (
 		activeNode.value &&
 		triggeredNode === activeNode.value.name &&
-		!workflowsStore.isNodeExecuting(activeNode.value.name)
+		workflowsStore.isNodeExecuting(props.currentNodeName)
 	) {
 		return true;
 	}
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
index 07acfb2dd7..84c30597f5 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -10,6 +10,7 @@ import {
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	STICKY_NODE_TYPE,
 	VIEWS,
+	WORKFLOW_EVALUATION_EXPERIMENT,
 } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -19,8 +20,10 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useExecutionsStore } from '@/stores/executions.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { usePushConnection } from '@/composables/usePushConnection';
+import { usePostHog } from '@/stores/posthog.store';
 
 import GithubButton from 'vue-github-button';
+import { useLocalStorage } from '@vueuse/core';
 
 const router = useRouter();
 const route = useRoute();
@@ -32,17 +35,28 @@ const sourceControlStore = useSourceControlStore();
 const workflowsStore = useWorkflowsStore();
 const executionsStore = useExecutionsStore();
 const settingsStore = useSettingsStore();
+const posthogStore = usePostHog();
 
 const activeHeaderTab = ref(MAIN_HEADER_TABS.WORKFLOW);
 const workflowToReturnTo = ref('');
 const executionToReturnTo = ref('');
 const dirtyState = ref(false);
-const githubButtonHidden = ref(localStorage.getItem(LOCAL_STORAGE_HIDE_GITHUB_STAR_BUTTON));
+const githubButtonHidden = useLocalStorage(LOCAL_STORAGE_HIDE_GITHUB_STAR_BUTTON, false);
 
-const tabBarItems = computed(() => [
-	{ value: MAIN_HEADER_TABS.WORKFLOW, label: locale.baseText('generic.editor') },
-	{ value: MAIN_HEADER_TABS.EXECUTIONS, label: locale.baseText('generic.executions') },
-]);
+const tabBarItems = computed(() => {
+	const items = [
+		{ value: MAIN_HEADER_TABS.WORKFLOW, label: locale.baseText('generic.editor') },
+		{ value: MAIN_HEADER_TABS.EXECUTIONS, label: locale.baseText('generic.executions') },
+	];
+
+	if (posthogStore.isFeatureEnabled(WORKFLOW_EVALUATION_EXPERIMENT)) {
+		items.push({
+			value: MAIN_HEADER_TABS.TEST_DEFINITION,
+			label: locale.baseText('generic.tests'),
+		});
+	}
+	return items;
+});
 
 const activeNode = computed(() => ndvStore.activeNode);
 const hideMenuBar = computed(() =>
@@ -58,10 +72,7 @@ const isEnterprise = computed(
 	() => settingsStore.isQueueModeEnabled && settingsStore.isWorkerViewAvailable,
 );
 const showGitHubButton = computed(
-	() =>
-		!isEnterprise.value &&
-		!settingsStore.settings.inE2ETests &&
-		githubButtonHidden.value !== 'true',
+	() => !isEnterprise.value && !settingsStore.settings.inE2ETests && !githubButtonHidden.value,
 );
 
 watch(route, (to, from) => {
@@ -82,6 +93,9 @@ onMounted(async () => {
 });
 
 function syncTabsWithRoute(to: RouteLocation, from?: RouteLocation): void {
+	if (to.matched.some((record) => record.name === VIEWS.TEST_DEFINITION)) {
+		activeHeaderTab.value = MAIN_HEADER_TABS.TEST_DEFINITION;
+	}
 	if (
 		to.name === VIEWS.EXECUTION_HOME ||
 		to.name === VIEWS.WORKFLOW_EXECUTIONS ||
@@ -121,6 +135,11 @@ function onTabSelected(tab: MAIN_HEADER_TABS, event: MouseEvent) {
 			void navigateToExecutionsView(openInNewTab);
 			break;
 
+		case MAIN_HEADER_TABS.TEST_DEFINITION:
+			activeHeaderTab.value = MAIN_HEADER_TABS.TEST_DEFINITION;
+			void router.push({ name: VIEWS.TEST_DEFINITION });
+			break;
+
 		default:
 			break;
 	}
@@ -175,8 +194,7 @@ async function navigateToExecutionsView(openInNewTab: boolean) {
 }
 
 function hideGithubButton() {
-	githubButtonHidden.value = 'true';
-	localStorage.setItem(LOCAL_STORAGE_HIDE_GITHUB_STAR_BUTTON, 'true');
+	githubButtonHidden.value = true;
 }
 </script>
 
@@ -202,7 +220,7 @@ function hideGithubButton() {
 				@update:model-value="onTabSelected"
 			/>
 		</div>
-		<div class="github-button" v-if="showGitHubButton">
+		<div v-if="showGitHubButton" class="github-button">
 			<div class="github-button-container">
 				<GithubButton
 					href="https://github.com/n8n-io/n8n"
@@ -253,6 +271,8 @@ function hideGithubButton() {
 	position: relative;
 	align-items: center;
 	align-self: stretch;
+	justify-content: center;
+	min-width: 170px;
 	padding-top: 2px;
 	padding-left: var(--spacing-m);
 	padding-right: var(--spacing-m);
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 089f6fee91..6c053057de 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -103,6 +103,7 @@ const tagsEventBus = createEventBus();
 const sourceControlModalEventBus = createEventBus();
 
 const {
+	isNewUser,
 	nodeViewVersion,
 	nodeViewSwitcherDiscovered,
 	isNodeViewDiscoveryTooltipVisible,
@@ -193,10 +194,14 @@ const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
 	actions.push({
 		id: WORKFLOW_MENU_ACTIONS.SWITCH_NODE_VIEW_VERSION,
 		...(nodeViewVersion.value === '2'
-			? {}
+			? nodeViewSwitcherDiscovered.value || isNewUser.value
+				? {}
+				: {
+						badge: locale.baseText('menuActions.badge.new'),
+					}
 			: nodeViewSwitcherDiscovered.value
 				? {
-						badge: locale.baseText('menuActions.badge.alpha'),
+						badge: locale.baseText('menuActions.badge.beta'),
 						badgeProps: {
 							theme: 'tertiary',
 						},
@@ -756,9 +761,12 @@ function showCreateWorkflowSuccessToast(id?: string) {
 					/>
 					<template #content>
 						<div class="mb-4xs">
-							<N8nBadge>{{ i18n.baseText('menuActions.badge.alpha') }}</N8nBadge>
+							<N8nBadge>{{ i18n.baseText('menuActions.badge.beta') }}</N8nBadge>
 						</div>
-						{{ i18n.baseText('menuActions.nodeViewDiscovery.tooltip') }}
+						<p>{{ i18n.baseText('menuActions.nodeViewDiscovery.tooltip') }}</p>
+						<N8nText color="text-light" size="small">
+							{{ i18n.baseText('menuActions.nodeViewDiscovery.tooltip.switchBack') }}
+						</N8nText>
 						<N8nIcon
 							:class="$style.closeNodeViewDiscovery"
 							icon="times-circle"
diff --git a/packages/editor-ui/src/components/ModalDrawer.vue b/packages/editor-ui/src/components/ModalDrawer.vue
index 0c7d477374..e7b113e991 100644
--- a/packages/editor-ui/src/components/ModalDrawer.vue
+++ b/packages/editor-ui/src/components/ModalDrawer.vue
@@ -13,10 +13,13 @@ const props = withDefaults(
 		modal?: boolean;
 		width: string;
 		wrapperClosable?: boolean;
+		closeOnClickModal?: boolean;
+		zIndex?: number;
 	}>(),
 	{
 		modal: true,
 		wrapperClosable: true,
+		closeOnClickModal: false,
 	},
 );
 
@@ -77,6 +80,8 @@ onBeforeUnmount(() => {
 		:before-close="close"
 		:modal="modal"
 		:wrapper-closable="wrapperClosable"
+		:close-on-click-modal="closeOnClickModal"
+		:z-index="zIndex"
 	>
 		<template #header>
 			<slot name="header" />
diff --git a/packages/editor-ui/src/components/NDVDraggablePanels.vue b/packages/editor-ui/src/components/NDVDraggablePanels.vue
index 6ece740eb4..07ab0ae294 100644
--- a/packages/editor-ui/src/components/NDVDraggablePanels.vue
+++ b/packages/editor-ui/src/components/NDVDraggablePanels.vue
@@ -8,10 +8,10 @@ import { LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH, MAIN_NODE_PANEL_WIDTH } from '
 import { useNDVStore } from '@/stores/ndv.store';
 import { ndvEventBus } from '@/event-bus';
 import NDVFloatingNodes from '@/components/NDVFloatingNodes.vue';
-import { useDebounce } from '@/composables/useDebounce';
 import type { MainPanelType, XYPosition } from '@/Interface';
 import { ref, onMounted, onBeforeUnmount, computed, watch } from 'vue';
 import { useUIStore } from '@/stores/ui.store';
+import { useThrottleFn } from '@vueuse/core';
 
 const SIDE_MARGIN = 24;
 const SIDE_PANELS_MARGIN = 80;
@@ -34,7 +34,8 @@ interface Props {
 	nodeType: INodeTypeDescription | null;
 }
 
-const { callDebounced } = useDebounce();
+const throttledOnResize = useThrottleFn(onResize, 100);
+
 const ndvStore = useNDVStore();
 const uiStore = useUIStore();
 
@@ -292,9 +293,9 @@ function onResizeEnd() {
 	storePositionData();
 }
 
-function onResizeDebounced(data: { direction: string; x: number; width: number }) {
+function onResizeThrottle(data: { direction: string; x: number; width: number }) {
 	if (initialized.value) {
-		void callDebounced(onResize, { debounceTime: 10, trailing: true }, data);
+		void throttledOnResize(data);
 	}
 }
 
@@ -368,13 +369,13 @@ function onDragEnd() {
 			<slot name="output"></slot>
 		</div>
 		<div :class="$style.mainPanel" :style="mainPanelStyles">
-			<n8n-resize-wrapper
+			<N8nResizeWrapper
 				:is-resizing-enabled="currentNodePaneType !== 'unknown'"
 				:width="relativeWidthToPx(mainPanelDimensions.relativeWidth)"
 				:min-width="MIN_PANEL_WIDTH"
 				:grid-size="20"
 				:supported-directions="supportedResizeDirections"
-				@resize="onResizeDebounced"
+				@resize="onResizeThrottle"
 				@resizeend="onResizeEnd"
 			>
 				<div :class="$style.dragButtonContainer">
@@ -391,7 +392,7 @@ function onDragEnd() {
 				<div :class="{ [$style.mainPanelInner]: true, [$style.dragging]: isDragging }">
 					<slot name="main" />
 				</div>
-			</n8n-resize-wrapper>
+			</N8nResizeWrapper>
 		</div>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index f801f0701c..b46c6b0a43 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -287,6 +287,7 @@ async function onClick() {
 			const updateInformation = await generateCodeForAiTransform(
 				prompt,
 				`parameters.${AI_TRANSFORM_JS_CODE}`,
+				5,
 			);
 			if (!updateInformation) return;
 
diff --git a/packages/editor-ui/src/components/NpsSurvey.vue b/packages/editor-ui/src/components/NpsSurvey.vue
index 41b69b110d..818f7483f8 100644
--- a/packages/editor-ui/src/components/NpsSurvey.vue
+++ b/packages/editor-ui/src/components/NpsSurvey.vue
@@ -8,6 +8,7 @@ import { ref, computed, watch } from 'vue';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
+import { useStyles } from '@/composables/useStyles';
 
 const props = defineProps<{
 	isActive?: boolean;
@@ -17,6 +18,7 @@ const rootStore = useRootStore();
 const i18n = useI18n();
 const toast = useToast();
 const telemetry = useTelemetry();
+const { APP_Z_INDEXES } = useStyles();
 
 const DEFAULT_TITLE = i18n.baseText('prompts.npsSurvey.recommendationQuestion');
 const GREAT_FEEDBACK_TITLE = i18n.baseText('prompts.npsSurvey.greatFeedbackTitle');
@@ -123,12 +125,14 @@ watch(
 		:name="NPS_SURVEY_MODAL_KEY"
 		:event-bus="modalBus"
 		:before-close="closeDialog"
-		:modal="false"
+		:modal="true"
 		:wrapper-closable="false"
 		direction="btt"
 		width="120px"
 		class="nps-survey"
 		:class="$style.npsSurvey"
+		:close-on-click-modal="false"
+		:z-index="APP_Z_INDEXES.NPS_SURVEY_MODAL"
 		data-test-id="nps-survey-modal"
 	>
 		<template #header>
diff --git a/packages/editor-ui/src/components/ParameterInput.test.ts b/packages/editor-ui/src/components/ParameterInput.test.ts
index 121c17c0d0..4ee22ec0dd 100644
--- a/packages/editor-ui/src/components/ParameterInput.test.ts
+++ b/packages/editor-ui/src/components/ParameterInput.test.ts
@@ -13,6 +13,27 @@ let mockNdvState: Partial<ReturnType<typeof useNDVStore>>;
 let mockNodeTypesState: Partial<ReturnType<typeof useNodeTypesStore>>;
 let mockCompletionResult: Partial<CompletionResult>;
 
+beforeEach(() => {
+	mockNdvState = {
+		hasInputData: true,
+		activeNode: {
+			id: faker.string.uuid(),
+			name: faker.word.words(3),
+			parameters: {},
+			position: [faker.number.int(), faker.number.int()],
+			type: 'test',
+			typeVersion: 1,
+		},
+		isInputPanelEmpty: false,
+		isOutputPanelEmpty: false,
+	};
+	mockNodeTypesState = {
+		allNodeTypes: [],
+	};
+	mockCompletionResult = {};
+	createAppModals();
+});
+
 vi.mock('@/stores/ndv.store', () => {
 	return {
 		useNDVStore: vi.fn(() => mockNdvState),
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index 5158d1b59a..93534fede9 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -22,6 +22,7 @@ import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 
 type Props = {
 	parameter: INodeProperties;
@@ -144,7 +145,11 @@ const evaluatedExpressionValue = computed(() => {
 });
 
 const evaluatedExpressionString = computed(() => {
-	return stringifyExpressionResult(evaluatedExpression.value);
+	const hasRunData =
+		!!useWorkflowsStore().workflowExecutionData?.data?.resultData?.runData[
+			ndvStore.activeNode?.name ?? ''
+		];
+	return stringifyExpressionResult(evaluatedExpression.value, hasRunData);
 });
 
 const expressionOutput = computed(() => {
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 9288f0731a..803bc86a0e 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -46,6 +46,7 @@ import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useI18n } from '@/composables/useI18n';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useNodeType } from '@/composables/useNodeType';
+import { useSettingsStore } from '@/stores/settings.store';
 import type { PinDataSource, UnpinDataSource } from '@/composables/usePinnedData';
 import { usePinnedData } from '@/composables/usePinnedData';
 import { useTelemetry } from '@/composables/useTelemetry';
@@ -86,8 +87,11 @@ const LazyRunDataTable = defineAsyncComponent(
 const LazyRunDataJson = defineAsyncComponent(
 	async () => await import('@/components/RunDataJson.vue'),
 );
-const LazyRunDataSchema = defineAsyncComponent(
-	async () => await import('@/components/RunDataSchema.vue'),
+
+const LazyRunDataSchema = defineAsyncComponent(async () =>
+	useSettingsStore().settings.virtualSchemaView
+		? await import('@/components/VirtualSchema.vue')
+		: await import('@/components/RunDataSchema.vue'),
 );
 const LazyRunDataHtml = defineAsyncComponent(
 	async () => await import('@/components/RunDataHtml.vue'),
diff --git a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
index b30ae7082c..a3d6cab8e8 100644
--- a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
+++ b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
@@ -260,12 +260,13 @@ onMounted(() => {
 .contentText {
 	padding-top: var(--spacing-s);
 	padding-left: var(--spacing-m);
+	padding-right: var(--spacing-m);
 	font-size: var(--font-size-s);
 }
 .block {
-	padding: 0 0 var(--spacing-2xs) var(--spacing-2xs);
-	background: var(--color-foreground-light);
-	margin-top: var(--spacing-xl);
+	padding: var(--spacing-s) 0 var(--spacing-2xs) var(--spacing-2xs);
+	border: 1px solid var(--color-foreground-light);
+	margin-top: var(--spacing-s);
 	border-radius: var(--border-radius-base);
 }
 :root .blockContent {
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
index d1ce4c5824..2f90ca0faa 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
@@ -167,10 +167,6 @@ function getTreeNodeData(nodeName: string, currentDepth: number): TreeNode[] {
 const aiData = computed<AIResult[]>(() => {
 	const result: AIResult[] = [];
 	const connectedSubNodes = props.workflow.getParentNodes(props.node.name, 'ALL_NON_MAIN');
-	const rootNodeResult = workflowsStore.getWorkflowResultDataByNodeName(props.node.name);
-	const rootNodeStartTime = rootNodeResult?.[props.runIndex ?? 0]?.startTime ?? 0;
-	const rootNodeEndTime =
-		rootNodeStartTime + (rootNodeResult?.[props.runIndex ?? 0]?.executionTime ?? 0);
 
 	connectedSubNodes.forEach((nodeName) => {
 		const nodeRunData = workflowsStore.getWorkflowResultDataByNodeName(nodeName) ?? [];
@@ -193,15 +189,7 @@ const aiData = computed<AIResult[]>(() => {
 		return aTime - bTime;
 	});
 
-	// Only show data that is within the root node's execution time
-	// This is because sub-node could be connected to multiple root nodes
-	const currentNodeResult = result.filter((r) => {
-		const startTime = r.data?.metadata?.startTime ?? 0;
-
-		return startTime >= rootNodeStartTime && startTime < rootNodeEndTime;
-	});
-
-	return currentNodeResult;
+	return result;
 });
 
 const executionTree = computed<TreeNode[]>(() => {
@@ -361,9 +349,7 @@ watch(() => props.runIndex, selectFirst, { immediate: true });
 	margin-right: var(--spacing-4xs);
 }
 .isSelected {
-	.nodeIcon {
-		background-color: var(--color-foreground-base);
-	}
+	background-color: var(--color-foreground-base);
 }
 .treeNode {
 	display: inline-flex;
diff --git a/packages/editor-ui/src/components/SourceControlInitializationErrorMessage.vue b/packages/editor-ui/src/components/SourceControlInitializationErrorMessage.vue
new file mode 100644
index 0000000000..f7c1bc7022
--- /dev/null
+++ b/packages/editor-ui/src/components/SourceControlInitializationErrorMessage.vue
@@ -0,0 +1,17 @@
+<script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
+import { RouterLink } from 'vue-router';
+import { VIEWS } from '@/constants';
+
+const i18n = useI18n();
+</script>
+
+<template>
+	<i18n-t keypath="settings.sourceControl.connection.error.message" tag="div">
+		<template #link>
+			<RouterLink :to="{ name: VIEWS.SOURCE_CONTROL }">
+				{{ i18n.baseText('settings.sourceControl.connection.error.link') }}
+			</RouterLink>
+		</template>
+	</i18n-t>
+</template>
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 2c25e455fc..67799b1657 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -12,11 +12,11 @@ import { useToast } from '@/composables/useToast';
 interface TagsDropdownProps {
 	placeholder: string;
 	modelValue: string[];
-	createTag: (name: string) => Promise<ITag>;
 	eventBus: EventBus | null;
 	allTags: ITag[];
 	isLoading: boolean;
 	tagsById: Record<string, ITag>;
+	createTag?: (name: string) => Promise<ITag>;
 }
 
 const i18n = useI18n();
@@ -109,6 +109,8 @@ function filterOptions(value = '') {
 }
 
 async function onCreate() {
+	if (!props.createTag) return;
+
 	const name = filter.value;
 	try {
 		const newTag = await props.createTag(name);
diff --git a/packages/editor-ui/src/components/Telemetry.test.ts b/packages/editor-ui/src/components/Telemetry.test.ts
new file mode 100644
index 0000000000..80ab0c6fc1
--- /dev/null
+++ b/packages/editor-ui/src/components/Telemetry.test.ts
@@ -0,0 +1,127 @@
+import { useRoute } from 'vue-router';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import type { MockedStore } from '@/__tests__/utils';
+import { mockedStore } from '@/__tests__/utils';
+import Telemetry from './Telemetry.vue';
+import { useRootStore } from '@/stores/root.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+vi.mock('vue-router', () => {
+	const meta = {};
+	return {
+		useRouter: vi.fn(),
+		useRoute: () => ({
+			meta,
+		}),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+vi.mock('@/composables/useTelemetry', () => {
+	const init = vi.fn();
+	return {
+		useTelemetry: () => ({
+			init,
+		}),
+	};
+});
+
+const renderComponent = createComponentRenderer(Telemetry, {
+	pinia: createTestingPinia(),
+});
+
+let route: ReturnType<typeof useRoute>;
+let rootStore: MockedStore<typeof useRootStore>;
+let settingsStore: MockedStore<typeof useSettingsStore>;
+let usersStore: MockedStore<typeof useUsersStore>;
+let telemetryPlugin: ReturnType<typeof useTelemetry>;
+
+describe('Telemetry', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+
+		route = useRoute();
+		rootStore = mockedStore(useRootStore);
+		settingsStore = mockedStore(useSettingsStore);
+		usersStore = mockedStore(useUsersStore);
+		telemetryPlugin = useTelemetry();
+	});
+
+	it('should not throw error when opened', async () => {
+		expect(() => renderComponent()).not.toThrow();
+	});
+
+	it('should initialize if telemetry is enabled in settings and not disabled on the route', async () => {
+		settingsStore.telemetry = {
+			enabled: true,
+		};
+		usersStore.currentUserId = '123';
+		rootStore.instanceId = '456';
+		renderComponent();
+
+		expect(telemetryPlugin.init).toHaveBeenCalledWith(
+			{
+				enabled: true,
+			},
+			expect.objectContaining({
+				userId: '123',
+				instanceId: '456',
+			}),
+		);
+	});
+
+	it('should not initialize if telemetry is disabled in settings', async () => {
+		settingsStore.telemetry = {
+			enabled: false,
+		};
+		renderComponent();
+
+		expect(telemetryPlugin.init).not.toHaveBeenCalled();
+	});
+
+	it('should not initialize if telemetry is disabled on the route', async () => {
+		settingsStore.telemetry = {
+			enabled: true,
+		};
+		route.meta.telemetry = {
+			disabled: true,
+		};
+		renderComponent();
+
+		expect(telemetryPlugin.init).not.toHaveBeenCalled();
+	});
+
+	it('should render the iframe with correct src', async () => {
+		settingsStore.telemetry = {
+			enabled: true,
+		};
+		usersStore.currentUserId = '123';
+		rootStore.instanceId = '456';
+		const { container } = renderComponent();
+
+		const iframe = container.querySelector('iframe');
+
+		expect(iframe).toBeInTheDocument();
+		expect(iframe).not.toBeVisible();
+		expect(iframe).toHaveAttribute('src', expect.stringContaining('userId=123'));
+		expect(iframe).toHaveAttribute('src', expect.stringContaining('instanceId=456'));
+	});
+
+	it('should not render the iframe if telemetry disabled', async () => {
+		settingsStore.telemetry = {
+			enabled: false,
+		};
+		usersStore.currentUserId = '123';
+		rootStore.instanceId = '456';
+		const { container } = renderComponent();
+
+		const iframe = container.querySelector('iframe');
+
+		expect(iframe).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/BlockArrow.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/BlockArrow.vue
new file mode 100644
index 0000000000..48267b3df4
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/BlockArrow.vue
@@ -0,0 +1,40 @@
+<template>
+	<div :class="$style.arrowConnector"></div>
+</template>
+
+<style module lang="scss">
+.arrowConnector {
+	$arrow-width: 12px;
+	$arrow-height: 8px;
+	$stalk-width: 2px;
+	$color: var(--color-text-dark);
+
+	position: relative;
+	height: var(--arrow-height, 3rem);
+	margin: 0.5rem 0;
+
+	&::before,
+	&::after {
+		content: '';
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	&::before {
+		top: 0;
+		width: $stalk-width;
+		height: calc(100% - #{$arrow-height});
+		background-color: $color;
+	}
+
+	&::after {
+		bottom: 0;
+		width: 0;
+		height: 0;
+		border-left: calc($arrow-width / 2) solid transparent;
+		border-right: calc($arrow-width / 2) solid transparent;
+		border-top: $arrow-height solid $color;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
new file mode 100644
index 0000000000..9b0ec16a7e
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+
+interface Props {
+	modelValue: string;
+}
+
+withDefaults(defineProps<Props>(), {
+	modelValue: '',
+});
+
+defineEmits<{ 'update:modelValue': [value: string] }>();
+
+const locale = useI18n();
+</script>
+
+<template>
+	<div :class="[$style.description]">
+		<n8n-input-label
+			:label="locale.baseText('testDefinition.edit.description')"
+			:bold="false"
+			size="small"
+			:class="$style.field"
+		>
+			<N8nInput
+				:model-value="modelValue"
+				type="textarea"
+				:placeholder="locale.baseText('testDefinition.edit.descriptionPlaceholder')"
+				@update:model-value="$emit('update:modelValue', $event)"
+			/>
+		</n8n-input-label>
+	</div>
+</template>
+
+<style module lang="scss">
+.field {
+	width: 100%;
+	margin-top: var(--spacing-xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue
new file mode 100644
index 0000000000..3f21e6a399
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue
@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+
+export interface EvaluationHeaderProps {
+	modelValue: {
+		value: string;
+		isEditing: boolean;
+		tempValue: string;
+	};
+	startEditing: (field: string) => void;
+	saveChanges: (field: string) => void;
+	handleKeydown: (e: KeyboardEvent, field: string) => void;
+}
+
+defineEmits<{ 'update:modelValue': [value: EvaluationHeaderProps['modelValue']] }>();
+defineProps<EvaluationHeaderProps>();
+
+const locale = useI18n();
+</script>
+
+<template>
+	<div :class="$style.header">
+		<n8n-icon-button
+			icon="arrow-left"
+			:class="$style.backButton"
+			type="tertiary"
+			:title="locale.baseText('testDefinition.edit.backButtonTitle')"
+			@click="$router.back()"
+		/>
+		<h2 :class="$style.title">
+			<template v-if="!modelValue.isEditing">
+				<span :class="$style.titleText">
+					{{ modelValue.value }}
+				</span>
+				<n8n-icon-button
+					:class="$style.editInputButton"
+					icon="pen"
+					type="tertiary"
+					@click="startEditing('name')"
+				/>
+			</template>
+			<N8nInput
+				v-else
+				ref="nameInput"
+				data-test-id="evaluation-name-input"
+				:model-value="modelValue.tempValue"
+				type="text"
+				:placeholder="locale.baseText('testDefinition.edit.namePlaceholder')"
+				@update:model-value="$emit('update:modelValue', { ...modelValue, tempValue: $event })"
+				@blur="() => saveChanges('name')"
+				@keydown="(e: KeyboardEvent) => handleKeydown(e, 'name')"
+			/>
+		</h2>
+	</div>
+</template>
+
+<style module lang="scss">
+.header {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-2xs);
+	margin-bottom: var(--spacing-l);
+
+	&:hover {
+		.editInputButton {
+			opacity: 1;
+		}
+	}
+}
+
+.title {
+	margin: 0;
+	flex-grow: 1;
+	font-size: var(--font-size-xl);
+	font-weight: var(--font-weight-bold);
+	color: var(--color-text-dark);
+	display: flex;
+	align-items: center;
+	max-width: 100%;
+	overflow: hidden;
+
+	.titleText {
+		display: block;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+
+.editInputButton {
+	--button-font-color: var(--prim-gray-490);
+	opacity: 0;
+	border: none;
+}
+
+.backButton {
+	--button-font-color: var(--color-text-light);
+	border: none;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
new file mode 100644
index 0000000000..f942613a35
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
@@ -0,0 +1,142 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import { ElCollapseTransition } from 'element-plus';
+import { ref, nextTick } from 'vue';
+
+interface EvaluationStep {
+	title: string;
+	warning?: boolean;
+	small?: boolean;
+	expanded?: boolean;
+}
+
+const props = withDefaults(defineProps<EvaluationStep>(), {
+	description: '',
+	warning: false,
+	small: false,
+	expanded: true,
+});
+
+const locale = useI18n();
+const isExpanded = ref(props.expanded);
+const contentRef = ref<HTMLElement | null>(null);
+const containerRef = ref<HTMLElement | null>(null);
+
+const toggleExpand = async () => {
+	isExpanded.value = !isExpanded.value;
+	if (isExpanded.value) {
+		await nextTick();
+		if (containerRef.value) {
+			containerRef.value.style.height = 'auto';
+		}
+	}
+};
+</script>
+
+<template>
+	<div ref="containerRef" :class="[$style.evaluationStep, small && $style.small]">
+		<div :class="$style.content">
+			<div :class="$style.header">
+				<div :class="[$style.icon, warning && $style.warning]">
+					<slot name="icon" />
+				</div>
+				<h3 :class="$style.title">{{ title }}</h3>
+				<span v-if="warning" :class="$style.warningIcon">⚠</span>
+				<button
+					v-if="$slots.cardContent"
+					:class="$style.collapseButton"
+					:aria-expanded="isExpanded"
+					:aria-controls="'content-' + title.replace(/\s+/g, '-')"
+					@click="toggleExpand"
+				>
+					{{
+						isExpanded
+							? locale.baseText('testDefinition.edit.step.collapse')
+							: locale.baseText('testDefinition.edit.step.expand')
+					}}
+					<font-awesome-icon :icon="isExpanded ? 'angle-down' : 'angle-right'" size="lg" />
+				</button>
+			</div>
+			<ElCollapseTransition v-if="$slots.cardContent">
+				<div v-show="isExpanded" :class="$style.cardContentWrapper">
+					<div ref="contentRef" :class="$style.cardContent">
+						<slot name="cardContent" />
+					</div>
+				</div>
+			</ElCollapseTransition>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.evaluationStep {
+	display: grid;
+	grid-template-columns: 1fr;
+	gap: var(--spacing-m);
+	background: var(--color-background-light);
+	padding: var(--spacing-s);
+	border-radius: var(--border-radius-xlarge);
+	box-shadow: var(--box-shadow-base);
+	border: var(--border-base);
+	width: 100%;
+	color: var(--color-text-dark);
+
+	&.small {
+		width: 80%;
+	}
+}
+.icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: var(--border-radius-base);
+	overflow: hidden;
+	width: 2rem;
+	height: 2rem;
+
+	&.warning {
+		background-color: var(--color-warning-tint-2);
+	}
+}
+
+.content {
+	display: grid;
+	gap: var(--spacing-2xs);
+}
+
+.header {
+	display: flex;
+	gap: var(--spacing-2xs);
+	align-items: center;
+}
+
+.title {
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-s);
+	line-height: 1.125rem;
+}
+
+.warningIcon {
+	color: var(--color-warning);
+}
+
+.cardContent {
+	font-size: var(--font-size-s);
+	margin-top: var(--spacing-xs);
+}
+.collapseButton {
+	cursor: pointer;
+	border: none;
+	background: none;
+	padding: 0;
+	font-size: var(--font-size-3xs);
+	color: var(--color-text-base);
+	margin-left: auto;
+	text-wrap: none;
+	overflow: hidden;
+	min-width: fit-content;
+}
+.cardContentWrapper {
+	height: max-content;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
new file mode 100644
index 0000000000..e899c8be2d
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
@@ -0,0 +1,75 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+
+export interface MetricsInputProps {
+	modelValue: string[];
+}
+const props = defineProps<MetricsInputProps>();
+const emit = defineEmits<{ 'update:modelValue': [value: MetricsInputProps['modelValue']] }>();
+const locale = useI18n();
+
+function addNewMetric() {
+	emit('update:modelValue', [...props.modelValue, '']);
+}
+
+function updateMetric(index: number, value: string) {
+	const newMetrics = [...props.modelValue];
+	newMetrics[index] = value;
+	emit('update:modelValue', newMetrics);
+}
+</script>
+
+<template>
+	<div :class="[$style.metrics]">
+		<n8n-input-label
+			:label="locale.baseText('testDefinition.edit.metricsFields')"
+			:bold="false"
+			:class="$style.metricField"
+		>
+			<div :class="$style.metricsContainer">
+				<div v-for="(metric, index) in modelValue" :key="index">
+					<N8nInput
+						:ref="`metric_${index}`"
+						data-test-id="evaluation-metric-item"
+						:model-value="metric"
+						:placeholder="locale.baseText('testDefinition.edit.metricsPlaceholder')"
+						@update:model-value="(value: string) => updateMetric(index, value)"
+					/>
+				</div>
+				<n8n-button
+					type="tertiary"
+					:label="locale.baseText('testDefinition.edit.metricsNew')"
+					:class="$style.newMetricButton"
+					@click="addNewMetric"
+				/>
+			</div>
+		</n8n-input-label>
+	</div>
+</template>
+
+<style module lang="scss">
+.metricsContainer {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-xs);
+}
+
+.metricField {
+	width: 100%;
+	margin-top: var(--spacing-xs);
+}
+
+.metricsDivider {
+	margin-top: var(--spacing-4xs);
+	margin-bottom: var(--spacing-3xs);
+}
+
+.newMetricButton {
+	align-self: flex-start;
+	margin-top: var(--spacing-2xs);
+	width: 100%;
+	background-color: var(--color-sticky-code-background);
+	border-color: var(--color-button-secondary-focus-outline);
+	color: var(--color-button-secondary-font);
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
new file mode 100644
index 0000000000..91e4df6261
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
@@ -0,0 +1,102 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { ITag } from '@/Interface';
+import { createEventBus } from 'n8n-design-system';
+import { computed } from 'vue';
+
+export interface TagsInputProps {
+	modelValue?: {
+		isEditing: boolean;
+		appliedTagIds: string[];
+	};
+	allTags: ITag[];
+	tagsById: Record<string, ITag>;
+	isLoading: boolean;
+	startEditing: (field: string) => void;
+	saveChanges: (field: string) => void;
+	cancelEditing: (field: string) => void;
+}
+
+const props = withDefaults(defineProps<TagsInputProps>(), {
+	modelValue: () => ({
+		isEditing: false,
+		appliedTagIds: [],
+	}),
+});
+
+const emit = defineEmits<{ 'update:modelValue': [value: TagsInputProps['modelValue']] }>();
+
+const locale = useI18n();
+const tagsEventBus = createEventBus();
+const getTagName = computed(() => (tagId: string) => {
+	return props.tagsById[tagId]?.name ?? '';
+});
+
+function updateTags(tags: string[]) {
+	const newTags = tags[0] ? [tags[0]] : [];
+	emit('update:modelValue', {
+		...props.modelValue,
+		appliedTagIds: newTags,
+	});
+}
+</script>
+
+<template>
+	<div data-test-id="workflow-tags-field">
+		<n8n-input-label
+			:label="locale.baseText('testDefinition.edit.tagName')"
+			:bold="false"
+			size="small"
+		>
+			<div v-if="!modelValue.isEditing" :class="$style.tagsRead" @click="startEditing('tags')">
+				<n8n-text v-if="modelValue.appliedTagIds.length === 0" size="small">
+					{{ locale.baseText('testDefinition.edit.selectTag') }}
+				</n8n-text>
+				<n8n-tag
+					v-for="tagId in modelValue.appliedTagIds"
+					:key="tagId"
+					:text="getTagName(tagId)"
+					data-test-id="evaluation-tag-field"
+				/>
+				<n8n-icon-button
+					:class="$style.editInputButton"
+					icon="pen"
+					type="tertiary"
+					size="small"
+					transparent
+				/>
+			</div>
+			<TagsDropdown
+				v-else
+				:model-value="modelValue.appliedTagIds"
+				:placeholder="locale.baseText('executionAnnotationView.chooseOrCreateATag')"
+				:create-enabled="false"
+				:all-tags="allTags"
+				:is-loading="isLoading"
+				:tags-by-id="tagsById"
+				data-test-id="workflow-tags-dropdown"
+				:event-bus="tagsEventBus"
+				@update:model-value="updateTags"
+				@esc="cancelEditing('tags')"
+				@blur="saveChanges('tags')"
+			/>
+		</n8n-input-label>
+		<n8n-text size="small" color="text-light">{{
+			locale.baseText('testDefinition.edit.tagsHelpText')
+		}}</n8n-text>
+	</div>
+</template>
+
+<style module lang="scss">
+.tagsRead {
+	&:hover .editInputButton {
+		opacity: 1;
+	}
+}
+
+.editInputButton {
+	opacity: 0;
+	border: none;
+	--button-font-color: var(--prim-gray-490);
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
new file mode 100644
index 0000000000..87626d3ae3
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { INodeParameterResourceLocator } from 'n8n-workflow';
+interface WorkflowSelectorProps {
+	modelValue: INodeParameterResourceLocator;
+}
+
+withDefaults(defineProps<WorkflowSelectorProps>(), {
+	modelValue: () => ({
+		mode: 'id',
+		value: '',
+		__rl: true,
+	}),
+});
+
+defineEmits<{ 'update:modelValue': [value: WorkflowSelectorProps['modelValue']] }>();
+const locale = useI18n();
+</script>
+<template>
+	<div>
+		<n8n-input-label
+			:label="locale.baseText('testDefinition.edit.workflowSelectorLabel')"
+			:bold="false"
+		>
+			<WorkflowSelectorParameterInput
+				ref="workflowInput"
+				:parameter="{
+					displayName: locale.baseText('testDefinition.edit.workflowSelectorDisplayName'),
+					name: 'workflowId',
+					type: 'workflowSelector',
+					default: '',
+				}"
+				:model-value="modelValue"
+				:display-title="locale.baseText('testDefinition.edit.workflowSelectorTitle')"
+				:is-value-expression="false"
+				:expression-edit-dialog-visible="false"
+				:path="'workflows'"
+				allow-new
+				@update:model-value="$emit('update:modelValue', $event)"
+			/>
+		</n8n-input-label>
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue b/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
new file mode 100644
index 0000000000..9f507c327f
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+
+defineEmits<{ 'create-test': [] }>();
+
+const locale = useI18n();
+</script>
+
+<template>
+	<div :class="$style.container">
+		<div :class="$style.header">
+			<h1>{{ locale.baseText('testDefinition.list.tests') }}</h1>
+		</div>
+		<n8n-action-box
+			:description="locale.baseText('testDefinition.list.actionDescription')"
+			:button-text="locale.baseText('testDefinition.list.actionButton')"
+			@click:button="$emit('create-test')"
+		/>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	max-width: 44rem;
+	margin: var(--spacing-4xl) auto 0;
+	gap: var(--spacing-l);
+}
+.header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	color: var(--color-text-dark);
+	font-size: var(--font-size-l);
+	margin-bottom: var(--spacing-xl);
+
+	h1 {
+		margin: 0;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
new file mode 100644
index 0000000000..350c48f663
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
@@ -0,0 +1,147 @@
+<script setup lang="ts">
+import type { TestListItem } from '@/components/TestDefinition/types';
+import { useI18n } from '@/composables/useI18n';
+import n8nIconButton from 'n8n-design-system/components/N8nIconButton';
+
+export interface TestItemProps {
+	test: TestListItem;
+}
+
+const props = defineProps<TestItemProps>();
+const locale = useI18n();
+
+const emit = defineEmits<{
+	'run-test': [testId: string];
+	'view-details': [testId: string];
+	'edit-test': [testId: string];
+	'delete-test': [testId: string];
+}>();
+
+const actions = [
+	{
+		icon: 'play',
+		event: () => emit('run-test', props.test.id),
+		tooltip: locale.baseText('testDefinition.runTest'),
+	},
+	{
+		icon: 'list',
+		event: () => emit('view-details', props.test.id),
+		tooltip: locale.baseText('testDefinition.viewDetails'),
+	},
+	{
+		icon: 'pen',
+		event: () => emit('edit-test', props.test.id),
+		tooltip: locale.baseText('testDefinition.editTest'),
+	},
+	{
+		icon: 'trash',
+		event: () => emit('delete-test', props.test.id),
+		tooltip: locale.baseText('testDefinition.deleteTest'),
+	},
+];
+</script>
+
+<template>
+	<div :class="$style.testItem" @click="$emit('view-details', test.id)">
+		<div :class="$style.testInfo">
+			<div :class="$style.testName">
+				{{ test.name }}
+				<n8n-tag v-if="test.tagName" :text="test.tagName" />
+			</div>
+			<div :class="$style.testCases">
+				{{ locale.baseText('testDefinition.list.testCases', { adjustToNumber: test.testCases }) }}
+				<n8n-loading v-if="!test.execution.lastRun" :loading="true" :rows="1" />
+				<span v-else>{{
+					locale.baseText('testDefinition.list.lastRun', {
+						interpolate: { lastRun: test.execution.lastRun },
+					})
+				}}</span>
+			</div>
+		</div>
+
+		<div :class="$style.metrics">
+			<div :class="$style.metric">
+				{{
+					locale.baseText('testDefinition.list.errorRate', {
+						interpolate: { errorRate: test.execution.errorRate ?? '-' },
+					})
+				}}
+			</div>
+			<div v-for="(value, key) in test.execution.metrics" :key="key" :class="$style.metric">
+				{{ key }}: {{ value ?? '-' }}
+			</div>
+		</div>
+
+		<div :class="$style.actions">
+			<n8n-tooltip v-for="action in actions" :key="action.icon" placement="top" :show-after="1000">
+				<template #content>
+					{{ action.tooltip }}
+				</template>
+				<component
+					:is="n8nIconButton"
+					:icon="action.icon"
+					type="tertiary"
+					size="mini"
+					@click.stop="action.event"
+				/>
+			</n8n-tooltip>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.testItem {
+	display: flex;
+	align-items: center;
+	padding: var(--spacing-s) var(--spacing-s) var(--spacing-s) var(--spacing-xl);
+	border: 1px solid var(--color-foreground-base);
+	border-radius: var(--border-radius-base);
+	background-color: var(--color-background-light);
+	cursor: pointer;
+
+	&:hover {
+		background-color: var(--color-background-base);
+	}
+}
+
+.testInfo {
+	display: flex;
+	flex: 1;
+	gap: var(--spacing-2xs);
+}
+
+.testName {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-2xs);
+	font-weight: var(--font-weight-bold);
+	margin-bottom: var(--spacing-4xs);
+	font-size: var(--font-size-s);
+}
+
+.testCases {
+	color: var(--color-text-base);
+	font-size: var(--font-size-2xs);
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-2xs);
+}
+
+.metrics {
+	display: flex;
+	gap: var(--spacing-l);
+	margin: 0 var(--spacing-l);
+}
+
+.metric {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+	white-space: nowrap;
+}
+
+.actions {
+	display: flex;
+	gap: var(--spacing-xs);
+	--color-button-secondary-font: var(--color-callout-info-icon);
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue
new file mode 100644
index 0000000000..e5e169dbe0
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import TestItem from './TestItem.vue';
+import type { TestListItem } from '@/components/TestDefinition/types';
+export interface TestListProps {
+	tests: TestListItem[];
+}
+
+defineEmits<{ 'create-test': [] }>();
+defineProps<TestListProps>();
+const locale = useI18n();
+</script>
+
+<template>
+	<div :class="$style.testsList">
+		<div :class="$style.testsHeader">
+			<n8n-button
+				:label="locale.baseText('testDefinition.list.createNew')"
+				@click="$emit('create-test')"
+			/>
+		</div>
+		<TestItem v-for="test in tests" :key="test.id" :test="test" v-bind="$attrs" />
+	</div>
+</template>
+
+<style module lang="scss">
+.testsList {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-s);
+}
+
+.testsHeader {
+	margin-bottom: var(--spacing-m);
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts b/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
new file mode 100644
index 0000000000..1a2ccd988a
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
@@ -0,0 +1,200 @@
+import { ref, computed } from 'vue';
+import type { ComponentPublicInstance } from 'vue';
+import type { INodeParameterResourceLocator } from 'n8n-workflow';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import type AnnotationTagsDropdownEe from '@/components/AnnotationTagsDropdown.ee.vue';
+import type { N8nInput } from 'n8n-design-system';
+import type { UpdateTestDefinitionParams } from '@/api/testDefinition.ee';
+
+interface EditableField {
+	value: string;
+	isEditing: boolean;
+	tempValue: string;
+}
+
+export interface IEvaluationFormState {
+	name: EditableField;
+	description: string;
+	tags: {
+		isEditing: boolean;
+		appliedTagIds: string[];
+	};
+	evaluationWorkflow: INodeParameterResourceLocator;
+	metrics: string[];
+}
+
+type FormRefs = {
+	nameInput: ComponentPublicInstance<typeof N8nInput>;
+	tagsInput: ComponentPublicInstance<typeof AnnotationTagsDropdownEe>;
+};
+
+export function useTestDefinitionForm() {
+	// Stores
+	const evaluationsStore = useTestDefinitionStore();
+
+	// Form state
+	const state = ref<IEvaluationFormState>({
+		description: '',
+		name: {
+			value: `My Test [${new Date().toLocaleString(undefined, { month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' })}]`,
+			isEditing: false,
+			tempValue: '',
+		},
+		tags: {
+			isEditing: false,
+			appliedTagIds: [],
+		},
+		evaluationWorkflow: {
+			mode: 'list',
+			value: '',
+			__rl: true,
+		},
+		metrics: [''],
+	});
+
+	// Loading states
+	const isSaving = ref(false);
+	const fieldsIssues = ref<Array<{ field: string; message: string }>>([]);
+
+	// Field refs
+	const fields = ref<FormRefs>({} as FormRefs);
+
+	// Methods
+	const loadTestData = async (testId: string) => {
+		try {
+			await evaluationsStore.fetchAll({ force: true });
+			const testDefinition = evaluationsStore.testDefinitionsById[testId];
+
+			if (testDefinition) {
+				state.value = {
+					description: testDefinition.description ?? '',
+					name: {
+						value: testDefinition.name ?? '',
+						isEditing: false,
+						tempValue: '',
+					},
+					tags: {
+						isEditing: false,
+						appliedTagIds: testDefinition.annotationTagId ? [testDefinition.annotationTagId] : [],
+					},
+					evaluationWorkflow: {
+						mode: 'list',
+						value: testDefinition.evaluationWorkflowId ?? '',
+						__rl: true,
+					},
+					metrics: [''],
+				};
+			}
+		} catch (error) {
+			// TODO: Throw better errors
+			console.error('Failed to load test data', error);
+		}
+	};
+
+	const createTest = async (workflowId: string) => {
+		if (isSaving.value) return;
+
+		isSaving.value = true;
+		fieldsIssues.value = [];
+
+		try {
+			// Prepare parameters for creating a new test
+			const params = {
+				name: state.value.name.value,
+				workflowId,
+				description: state.value.description,
+			};
+
+			const newTest = await evaluationsStore.create(params);
+			return newTest;
+		} catch (error) {
+			throw error;
+		} finally {
+			isSaving.value = false;
+		}
+	};
+
+	const updateTest = async (testId: string) => {
+		if (isSaving.value) return;
+
+		isSaving.value = true;
+		fieldsIssues.value = [];
+
+		try {
+			// Check if the test ID is provided
+			if (!testId) {
+				throw new Error('Test ID is required for updating a test');
+			}
+
+			// Prepare parameters for updating the existing test
+			const params: UpdateTestDefinitionParams = {
+				name: state.value.name.value,
+				description: state.value.description,
+			};
+			if (state.value.evaluationWorkflow.value) {
+				params.evaluationWorkflowId = state.value.evaluationWorkflow.value.toString();
+			}
+
+			const annotationTagId = state.value.tags.appliedTagIds[0];
+			if (annotationTagId) {
+				params.annotationTagId = annotationTagId;
+			}
+			// Update the existing test
+			return await evaluationsStore.update({ ...params, id: testId });
+		} catch (error) {
+			throw error;
+		} finally {
+			isSaving.value = false;
+		}
+	};
+
+	const startEditing = async (field: string) => {
+		if (field === 'name') {
+			state.value.name.tempValue = state.value.name.value;
+			state.value.name.isEditing = true;
+		} else {
+			state.value.tags.isEditing = true;
+		}
+	};
+
+	const saveChanges = (field: string) => {
+		if (field === 'name') {
+			state.value.name.value = state.value.name.tempValue;
+			state.value.name.isEditing = false;
+		} else {
+			state.value.tags.isEditing = false;
+		}
+	};
+
+	const cancelEditing = (field: string) => {
+		if (field === 'name') {
+			state.value.name.isEditing = false;
+			state.value.name.tempValue = '';
+		} else {
+			state.value.tags.isEditing = false;
+		}
+	};
+
+	const handleKeydown = (event: KeyboardEvent, field: string) => {
+		if (event.key === 'Escape') {
+			cancelEditing(field);
+		} else if (event.key === 'Enter' && !event.shiftKey) {
+			event.preventDefault();
+			saveChanges(field);
+		}
+	};
+
+	return {
+		state,
+		fields,
+		isSaving: computed(() => isSaving.value),
+		fieldsIssues: computed(() => fieldsIssues.value),
+		loadTestData,
+		createTest,
+		updateTest,
+		startEditing,
+		saveChanges,
+		cancelEditing,
+		handleKeydown,
+	};
+}
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts b/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
new file mode 100644
index 0000000000..43b2164521
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
@@ -0,0 +1,56 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { createComponentRenderer } from '@/__tests__/render';
+import MetricsInput from '../EditDefinition/MetricsInput.vue';
+import userEvent from '@testing-library/user-event';
+
+const renderComponent = createComponentRenderer(MetricsInput);
+
+describe('MetricsInput', () => {
+	let props: { modelValue: string[] };
+
+	beforeEach(() => {
+		props = {
+			modelValue: ['Metric 1', 'Metric 2'],
+		};
+	});
+
+	it('should render correctly with initial metrics', () => {
+		const { getAllByPlaceholderText } = renderComponent({ props });
+		const inputs = getAllByPlaceholderText('Enter metric name');
+		expect(inputs).toHaveLength(2);
+		expect(inputs[0]).toHaveValue('Metric 1');
+		expect(inputs[1]).toHaveValue('Metric 2');
+	});
+
+	it('should update a metric when typing in the input', async () => {
+		const { getAllByPlaceholderText, emitted } = renderComponent({
+			props: {
+				modelValue: [''],
+			},
+		});
+		const inputs = getAllByPlaceholderText('Enter metric name');
+		await userEvent.type(inputs[0], 'Updated Metric 1');
+
+		expect(emitted('update:modelValue')).toBeTruthy();
+		expect(emitted('update:modelValue')).toEqual('Updated Metric 1'.split('').map((c) => [[c]]));
+	});
+
+	it('should render correctly with no initial metrics', () => {
+		props.modelValue = [];
+		const { queryAllByRole, getByText } = renderComponent({ props });
+		const inputs = queryAllByRole('textbox');
+		expect(inputs).toHaveLength(0);
+		expect(getByText('New metric')).toBeInTheDocument();
+	});
+
+	it('should handle adding multiple metrics', async () => {
+		const { getByText, emitted } = renderComponent({ props });
+		const addButton = getByText('New metric');
+
+		addButton.click();
+		addButton.click();
+		addButton.click();
+
+		expect(emitted('update:modelValue')).toHaveProperty('length', 3);
+	});
+});
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts b/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
new file mode 100644
index 0000000000..952807d7cc
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
@@ -0,0 +1,176 @@
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { useTestDefinitionForm } from '../composables/useTestDefinitionForm';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import { mockedStore } from '@/__tests__/utils';
+import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+
+const TEST_DEF_A: TestDefinitionRecord = {
+	id: '1',
+	name: 'Test Definition A',
+	description: 'Description A',
+	evaluationWorkflowId: '456',
+	workflowId: '123',
+	annotationTagId: '789',
+};
+const TEST_DEF_B: TestDefinitionRecord = {
+	id: '2',
+	name: 'Test Definition B',
+	workflowId: '123',
+	description: 'Description B',
+};
+const TEST_DEF_NEW: TestDefinitionRecord = {
+	id: '3',
+	workflowId: '123',
+	name: 'New Test Definition',
+	description: 'New Description',
+};
+
+beforeEach(() => {
+	const pinia = createTestingPinia();
+	setActivePinia(pinia);
+});
+
+afterEach(() => {
+	vi.clearAllMocks();
+});
+
+describe('useTestDefinitionForm', async () => {
+	it('should initialize with default props', async () => {
+		const { state } = useTestDefinitionForm();
+
+		expect(state.value.description).toEqual('');
+		expect(state.value.name.value).toContain('My Test');
+		expect(state.value.tags.appliedTagIds).toEqual([]);
+		expect(state.value.metrics).toEqual(['']);
+		expect(state.value.evaluationWorkflow.value).toEqual('');
+	});
+
+	it('should load test data', async () => {
+		const { loadTestData, state } = useTestDefinitionForm();
+		const fetchSpy = vi.fn();
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+
+		expect(state.value.description).toEqual('');
+		expect(state.value.name.value).toContain('My Test');
+		evaluationsStore.testDefinitionsById = {
+			[TEST_DEF_A.id]: TEST_DEF_A,
+			[TEST_DEF_B.id]: TEST_DEF_B,
+		};
+		evaluationsStore.fetchAll = fetchSpy;
+
+		await loadTestData(TEST_DEF_A.id);
+		expect(fetchSpy).toBeCalled();
+		expect(state.value.name.value).toEqual(TEST_DEF_A.name);
+		expect(state.value.description).toEqual(TEST_DEF_A.description);
+		expect(state.value.tags.appliedTagIds).toEqual([TEST_DEF_A.annotationTagId]);
+		expect(state.value.evaluationWorkflow.value).toEqual(TEST_DEF_A.evaluationWorkflowId);
+	});
+
+	it('should save a new test', async () => {
+		const { createTest, state } = useTestDefinitionForm();
+		const createSpy = vi.fn().mockResolvedValue(TEST_DEF_NEW);
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+
+		evaluationsStore.create = createSpy;
+
+		state.value.name.value = TEST_DEF_NEW.name;
+		state.value.description = TEST_DEF_NEW.description ?? '';
+
+		const newTest = await createTest('123');
+		expect(createSpy).toBeCalledWith({
+			name: TEST_DEF_NEW.name,
+			description: TEST_DEF_NEW.description,
+			workflowId: '123',
+		});
+		expect(newTest).toEqual(TEST_DEF_NEW);
+	});
+
+	it('should update an existing test', async () => {
+		const { updateTest, state } = useTestDefinitionForm();
+		const updateSpy = vi.fn().mockResolvedValue(TEST_DEF_B);
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+
+		evaluationsStore.update = updateSpy;
+
+		state.value.name.value = TEST_DEF_B.name;
+		state.value.description = TEST_DEF_B.description ?? '';
+
+		const updatedTest = await updateTest(TEST_DEF_A.id);
+		expect(updateSpy).toBeCalledWith({
+			id: TEST_DEF_A.id,
+			name: TEST_DEF_B.name,
+			description: TEST_DEF_B.description,
+		});
+		expect(updatedTest).toEqual(TEST_DEF_B);
+	});
+
+	it('should start editing a field', async () => {
+		const { state, startEditing } = useTestDefinitionForm();
+
+		await startEditing('name');
+		expect(state.value.name.isEditing).toBe(true);
+		expect(state.value.name.tempValue).toBe(state.value.name.value);
+
+		await startEditing('tags');
+		expect(state.value.tags.isEditing).toBe(true);
+	});
+
+	it('should save changes to a field', async () => {
+		const { state, startEditing, saveChanges } = useTestDefinitionForm();
+
+		await startEditing('name');
+		state.value.name.tempValue = 'New Name';
+		saveChanges('name');
+		expect(state.value.name.isEditing).toBe(false);
+		expect(state.value.name.value).toBe('New Name');
+
+		await startEditing('tags');
+		state.value.tags.appliedTagIds = ['123'];
+		saveChanges('tags');
+		expect(state.value.tags.isEditing).toBe(false);
+		expect(state.value.tags.appliedTagIds).toEqual(['123']);
+	});
+
+	it('should cancel editing a field', async () => {
+		const { state, startEditing, cancelEditing } = useTestDefinitionForm();
+
+		await startEditing('name');
+		state.value.name.tempValue = 'New Name';
+		cancelEditing('name');
+		expect(state.value.name.isEditing).toBe(false);
+		expect(state.value.name.tempValue).toBe('');
+
+		await startEditing('tags');
+		state.value.tags.appliedTagIds = ['123'];
+		cancelEditing('tags');
+		expect(state.value.tags.isEditing).toBe(false);
+	});
+
+	it('should handle keydown - Escape', async () => {
+		const { state, startEditing, handleKeydown } = useTestDefinitionForm();
+
+		await startEditing('name');
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Escape' }), 'name');
+		expect(state.value.name.isEditing).toBe(false);
+
+		await startEditing('tags');
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Escape' }), 'tags');
+		expect(state.value.tags.isEditing).toBe(false);
+	});
+
+	it('should handle keydown - Enter', async () => {
+		const { state, startEditing, handleKeydown } = useTestDefinitionForm();
+
+		await startEditing('name');
+		state.value.name.tempValue = 'New Name';
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Enter' }), 'name');
+		expect(state.value.name.isEditing).toBe(false);
+		expect(state.value.name.value).toBe('New Name');
+
+		await startEditing('tags');
+		state.value.tags.appliedTagIds = ['123'];
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Enter' }), 'tags');
+		expect(state.value.tags.isEditing).toBe(false);
+	});
+});
diff --git a/packages/editor-ui/src/components/TestDefinition/types.ts b/packages/editor-ui/src/components/TestDefinition/types.ts
new file mode 100644
index 0000000000..68a9d246a5
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/types.ts
@@ -0,0 +1,13 @@
+export interface TestExecution {
+	lastRun: string | null;
+	errorRate: number | null;
+	metrics: Record<string, number>;
+}
+
+export interface TestListItem {
+	id: string;
+	name: string;
+	tagName: string;
+	testCases: number;
+	execution: TestExecution;
+}
diff --git a/packages/editor-ui/src/components/VirtualSchema.test.ts b/packages/editor-ui/src/components/VirtualSchema.test.ts
new file mode 100644
index 0000000000..0a000ea24e
--- /dev/null
+++ b/packages/editor-ui/src/components/VirtualSchema.test.ts
@@ -0,0 +1,439 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import VirtualSchema from '@/components/VirtualSchema.vue';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { userEvent } from '@testing-library/user-event';
+import { cleanup, waitFor } from '@testing-library/vue';
+import { createPinia, setActivePinia } from 'pinia';
+import {
+	createTestNode,
+	defaultNodeDescriptions,
+	mockNodeTypeDescription,
+} from '@/__tests__/mocks';
+import { IF_NODE_TYPE, SET_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE } from '@/constants';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { mock } from 'vitest-mock-extended';
+import type { IWorkflowDb } from '@/Interface';
+import { NodeConnectionType, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
+import * as nodeHelpers from '@/composables/useNodeHelpers';
+import { useNDVStore } from '@/stores/ndv.store';
+import { fireEvent } from '@testing-library/dom';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+const mockNode1 = createTestNode({
+	name: 'Manual Trigger',
+	type: MANUAL_TRIGGER_NODE_TYPE,
+	typeVersion: 1,
+	disabled: false,
+});
+
+const mockNode2 = createTestNode({
+	name: 'Set2',
+	type: SET_NODE_TYPE,
+	typeVersion: 1,
+	disabled: false,
+});
+
+const disabledNode = createTestNode({
+	name: 'Disabled Node',
+	type: SET_NODE_TYPE,
+	typeVersion: 1,
+	disabled: true,
+});
+
+const ifNode = createTestNode({
+	name: 'If',
+	type: IF_NODE_TYPE,
+	typeVersion: 1,
+	disabled: false,
+});
+
+const aiTool = createTestNode({
+	name: 'AI Tool',
+	type: '@n8n/n8n-nodes-langchain.memoryBufferWindow',
+	typeVersion: 1,
+	disabled: false,
+});
+
+const unknownNodeType = createTestNode({
+	name: 'Unknown Node Type',
+	type: 'unknown',
+});
+
+const defaultNodes = [
+	{ name: 'Manual Trigger', indicies: [], depth: 1 },
+	{ name: 'Set2', indicies: [], depth: 2 },
+];
+
+async function setupStore() {
+	const workflow = mock<IWorkflowDb>({
+		id: '123',
+		name: 'Test Workflow',
+		connections: {},
+		active: true,
+		nodes: [mockNode1, mockNode2, disabledNode, ifNode, aiTool, unknownNodeType],
+	});
+
+	const pinia = createPinia();
+	setActivePinia(pinia);
+
+	const workflowsStore = useWorkflowsStore();
+	const nodeTypesStore = useNodeTypesStore();
+
+	nodeTypesStore.setNodeTypes([
+		...defaultNodeDescriptions,
+		mockNodeTypeDescription({
+			name: MANUAL_TRIGGER_NODE_TYPE,
+			outputs: [NodeConnectionType.Main],
+		}),
+		mockNodeTypeDescription({
+			name: IF_NODE_TYPE,
+			outputs: [NodeConnectionType.Main, NodeConnectionType.Main],
+		}),
+	]);
+	workflowsStore.workflow = workflow;
+
+	return pinia;
+}
+
+function mockNodeOutputData(nodeName: string, data: IDataObject[], outputIndex = 0) {
+	const originalNodeHelpers = nodeHelpers.useNodeHelpers();
+	vi.spyOn(nodeHelpers, 'useNodeHelpers').mockImplementation(() => {
+		return {
+			...originalNodeHelpers,
+			getNodeInputData: vi.fn((node, _, output) => {
+				if (node.name === nodeName && output === outputIndex) {
+					return data.map((json) => ({ json }));
+				}
+				return [];
+			}),
+		};
+	});
+}
+
+describe('RunDataSchema.vue', () => {
+	let renderComponent: ReturnType<typeof createComponentRenderer>;
+
+	const DynamicScrollerStub = {
+		props: {
+			items: Array,
+		},
+		template:
+			'<div><template v-for="item in items"><slot v-bind="{ item }"></slot></template></div>',
+		methods: {
+			scrollToItem: vi.fn(),
+		},
+	};
+
+	const DynamicScrollerItemStub = {
+		template: '<slot></slot>',
+	};
+
+	beforeEach(async () => {
+		cleanup();
+		renderComponent = createComponentRenderer(VirtualSchema, {
+			global: {
+				stubs: {
+					DynamicScroller: DynamicScrollerStub,
+					DynamicScrollerItem: DynamicScrollerItemStub,
+					FontAwesomeIcon: true,
+				},
+			},
+			pinia: await setupStore(),
+			props: {
+				mappingEnabled: true,
+				runIndex: 1,
+				outputIndex: 0,
+				totalRuns: 2,
+				paneType: 'input',
+				connectionType: 'main',
+				search: '',
+				nodes: defaultNodes,
+			},
+		});
+	});
+
+	it('renders schema for empty data', async () => {
+		const { getAllByText, getAllByTestId } = renderComponent();
+
+		expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(2);
+
+		// Collapse second node
+		await userEvent.click(getAllByTestId('run-data-schema-header')[1]);
+		expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(1);
+	});
+
+	it('renders schema for data', async () => {
+		useWorkflowsStore().pinData({
+			node: mockNode1,
+			data: [
+				{ json: { name: 'John', age: 22, hobbies: ['surfing', 'traveling'] } },
+				{ json: { name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] } },
+			],
+		});
+		useWorkflowsStore().pinData({
+			node: mockNode2,
+			data: [
+				{ json: { name: 'John', age: 22, hobbies: ['surfing', 'traveling'] } },
+				{ json: { name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] } },
+			],
+		});
+
+		const { getAllByTestId } = renderComponent();
+		const headers = getAllByTestId('run-data-schema-header');
+		expect(headers.length).toBe(2);
+		expect(headers[0]).toHaveTextContent('Manual Trigger');
+		expect(headers[0]).toHaveTextContent('2 items');
+		expect(headers[1]).toHaveTextContent('Set2');
+
+		const items = getAllByTestId('run-data-schema-item');
+
+		expect(items[0]).toHaveTextContent('nameJohn');
+		expect(items[1]).toHaveTextContent('age22');
+		expect(items[2]).toHaveTextContent('hobbies');
+		expect(items[3]).toHaveTextContent('hobbies[0]surfing');
+		expect(items[4]).toHaveTextContent('hobbies[1]traveling');
+	});
+
+	it('renders schema in output pane', async () => {
+		const { container } = renderComponent({
+			props: {
+				nodes: [],
+				paneType: 'output',
+				node: mockNode1,
+				data: [
+					{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
+					{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
+				],
+			},
+		});
+
+		expect(container).toMatchSnapshot();
+	});
+
+	it('renders schema with spaces and dots', () => {
+		useWorkflowsStore().pinData({
+			node: mockNode1,
+			data: [
+				{
+					json: {
+						'hello world': [
+							{
+								test: {
+									'more to think about': 1,
+								},
+								'test.how': 'ignore',
+							},
+						],
+					},
+				},
+			],
+		});
+
+		const { container } = renderComponent();
+		expect(container).toMatchSnapshot();
+	});
+
+	it('renders no data to show for data empty objects', () => {
+		useWorkflowsStore().pinData({
+			node: mockNode1,
+			data: [{ json: {} }, { json: {} }],
+		});
+
+		const { getAllByText } = renderComponent();
+		expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(2);
+	});
+
+	// this can happen when setting the output to [{}]
+	it('renders empty state to show for empty data', () => {
+		useWorkflowsStore().pinData({
+			node: mockNode1,
+			data: [{} as INodeExecutionData],
+		});
+
+		const { getAllByText } = renderComponent({ props: { paneType: 'output' } });
+		expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(1);
+	});
+
+	it('renders disabled nodes correctly', () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				nodes: [{ name: disabledNode.name, indicies: [], depth: 1 }],
+			},
+		});
+		expect(getByTestId('run-data-schema-header')).toHaveTextContent(
+			`${disabledNode.name} (Deactivated)`,
+		);
+	});
+
+	it('renders schema for correct output branch', async () => {
+		mockNodeOutputData(
+			'If',
+			[
+				{ id: 1, name: 'John' },
+				{ id: 2, name: 'Jane' },
+			],
+			1,
+		);
+		const { getByTestId } = renderComponent({
+			props: {
+				nodes: [{ name: 'If', indicies: [1], depth: 2 }],
+			},
+		});
+
+		await waitFor(() => {
+			expect(getByTestId('run-data-schema-header')).toHaveTextContent('If');
+			expect(getByTestId('run-data-schema-header')).toHaveTextContent('2 items');
+			expect(getByTestId('run-data-schema-header')).toMatchSnapshot();
+		});
+	});
+
+	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-header')).toHaveTextContent('If');
+			expect(getByTestId('run-data-schema-header')).toHaveTextContent('2 items');
+			expect(getByTestId('run-data-schema-header')).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' }],
+			},
+		});
+
+		expect(getByTestId('run-data-schema-item')).toHaveTextContent('AI tool output');
+	});
+
+	test.each([[[{ tx: false }, { tx: false }]], [[{ tx: '' }, { tx: '' }]], [[{ tx: [] }]]])(
+		'renders schema instead of showing no data for %o',
+		(data) => {
+			useWorkflowsStore().pinData({
+				node: mockNode1,
+				data: data.map((item) => ({ json: item })),
+			});
+
+			const { getAllByTestId } = renderComponent();
+			expect(getAllByTestId('run-data-schema-item')[0]).toHaveTextContent('tx');
+		},
+	);
+
+	it('should filter invalid connections', () => {
+		const { pinData } = useWorkflowsStore();
+		pinData({
+			node: mockNode1,
+			data: [{ json: { tx: 1 } }],
+		});
+		pinData({
+			node: mockNode2,
+			data: [{ json: { tx: 2 } }],
+		});
+
+		const { getAllByTestId } = renderComponent({
+			props: {
+				nodes: [
+					{ name: mockNode1.name, indicies: [], depth: 1 },
+					{ name: 'unknown', indicies: [], depth: 1 },
+					{ name: mockNode2.name, indicies: [], depth: 1 },
+					{ name: unknownNodeType.name, indicies: [], depth: 1 },
+				],
+			},
+		});
+
+		expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+	});
+
+	it('should show connections', () => {
+		const ndvStore = useNDVStore();
+		vi.spyOn(ndvStore, 'ndvNodeInputNumber', 'get').mockReturnValue({
+			[defaultNodes[0].name]: [0],
+			[defaultNodes[1].name]: [0, 1, 2],
+		});
+
+		const { getAllByTestId } = renderComponent();
+		const headers = getAllByTestId('run-data-schema-header');
+		expect(headers.length).toBe(2);
+		expect(headers[0]).toHaveTextContent('Input 0');
+		expect(headers[1]).toHaveTextContent('Inputs 0, 1, 2');
+	});
+
+	it('should handle drop event', async () => {
+		const ndvStore = useNDVStore();
+		useWorkflowsStore().pinData({
+			node: mockNode1,
+			data: [{ json: { name: 'John', age: 22, hobbies: ['surfing', 'traveling'] } }],
+		});
+		const telemetry = useTelemetry();
+		const trackSpy = vi.spyOn(telemetry, 'track');
+		const reset = vi.spyOn(ndvStore, 'resetMappingTelemetry');
+		const { getAllByTestId } = renderComponent();
+
+		const items = getAllByTestId('run-data-schema-item');
+		expect(items.length).toBe(6);
+
+		expect(items[0].className).toBe('schema-item draggable');
+		expect(items[0]).toHaveTextContent('nameJohn');
+
+		const pill = items[0].querySelector('.pill') as Element;
+
+		fireEvent(pill, new MouseEvent('mousedown', { bubbles: true }));
+		fireEvent(window, new MouseEvent('mousemove', { bubbles: true }));
+		expect(reset).toHaveBeenCalled();
+
+		fireEvent(window, new MouseEvent('mouseup', { bubbles: true }));
+
+		await waitFor(() =>
+			expect(trackSpy).toHaveBeenCalledWith(
+				'User dragged data for mapping',
+				expect.any(Object),
+				expect.any(Object),
+			),
+		);
+	});
+
+	it('should expand all nodes when searching', async () => {
+		useWorkflowsStore().pinData({
+			node: mockNode1,
+			data: [{ json: { name: 'John' } }],
+		});
+		useWorkflowsStore().pinData({
+			node: mockNode2,
+			data: [{ json: { name: 'John' } }],
+		});
+
+		const { getAllByTestId, queryAllByTestId, rerender } = renderComponent();
+		const headers = getAllByTestId('run-data-schema-header');
+		expect(headers.length).toBe(2);
+		expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+
+		// Collapse all nodes
+		await Promise.all(headers.map(async ($header) => await userEvent.click($header)));
+
+		expect(queryAllByTestId('run-data-schema-item').length).toBe(0);
+		await rerender({ search: 'John' });
+		expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+	});
+});
diff --git a/packages/editor-ui/src/components/VirtualSchema.vue b/packages/editor-ui/src/components/VirtualSchema.vue
new file mode 100644
index 0000000000..2a4c0ebedc
--- /dev/null
+++ b/packages/editor-ui/src/components/VirtualSchema.vue
@@ -0,0 +1,292 @@
+<script lang="ts" setup>
+import { computed, watch, ref } from 'vue';
+import type { INodeUi } from '@/Interface';
+import VirtualSchemaItem from '@/components/VirtualSchemaItem.vue';
+import VirtualSchemaHeader from '@/components/VirtualSchemaHeader.vue';
+import { N8nText } from 'n8n-design-system';
+import Draggable from '@/components/Draggable.vue';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { NodeConnectionType, type IConnectedNode, type IDataObject } from 'n8n-workflow';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useI18n } from '@/composables/useI18n';
+import MappingPill from './MappingPill.vue';
+import { useDataSchema, useFlattenSchema, type SchemaNode } from '@/composables/useDataSchema';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import {
+	DynamicScroller,
+	DynamicScrollerItem,
+	type RecycleScrollerInstance,
+} from 'vue-virtual-scroller';
+
+import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
+
+type Props = {
+	nodes?: IConnectedNode[];
+	node?: INodeUi | null;
+	data?: IDataObject[];
+	mappingEnabled?: boolean;
+	runIndex?: number;
+	outputIndex?: number;
+	totalRuns?: number;
+	paneType: 'input' | 'output';
+	connectionType?: NodeConnectionType;
+	search?: string;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	nodes: () => [],
+	distanceFromActive: 1,
+	node: null,
+	data: () => [],
+	runIndex: 0,
+	outputIndex: 0,
+	totalRuns: 1,
+	connectionType: NodeConnectionType.Main,
+	search: '',
+	mappingEnabled: false,
+});
+
+const telemetry = useTelemetry();
+const i18n = useI18n();
+const ndvStore = useNDVStore();
+const nodeTypesStore = useNodeTypesStore();
+const workflowsStore = useWorkflowsStore();
+const { getSchemaForExecutionData, filterSchema } = useDataSchema();
+const { closedNodes, flattenSchema, flattenMultipleSchemas, toggleLeaf, toggleNode } =
+	useFlattenSchema();
+const { getNodeInputData } = useNodeHelpers();
+
+const emit = defineEmits<{
+	'clear:search': [];
+}>();
+
+const scroller = ref<RecycleScrollerInstance>();
+
+const toggleNodeAndScrollTop = (id: string) => {
+	toggleNode(id);
+	scroller.value?.scrollToItem(0);
+};
+
+watch(
+	() => props.search,
+	(newSearch) => {
+		if (!newSearch) return;
+		closedNodes.value.clear();
+	},
+);
+
+const getNodeSchema = (fullNode: INodeUi, connectedNode: IConnectedNode) => {
+	const pinData = workflowsStore.pinDataByNodeName(connectedNode.name);
+	const connectedOutputIndexes = connectedNode.indicies.length > 0 ? connectedNode.indicies : [0];
+	const data =
+		pinData ??
+		connectedOutputIndexes
+			.map((outputIndex) =>
+				executionDataToJson(
+					getNodeInputData(
+						fullNode,
+						props.runIndex,
+						outputIndex,
+						props.paneType,
+						props.connectionType,
+					),
+				),
+			)
+			.flat();
+
+	return {
+		schema: getSchemaForExecutionData(data),
+		connectedOutputIndexes,
+		itemsCount: data.length,
+	};
+};
+
+const nodeSchema = computed(() =>
+	filterSchema(getSchemaForExecutionData(props.data), props.search),
+);
+
+const nodesSchemas = computed<SchemaNode[]>(() => {
+	return props.nodes.reduce<SchemaNode[]>((acc, node) => {
+		const fullNode = workflowsStore.getNodeByName(node.name);
+		if (!fullNode) return acc;
+
+		const nodeType = nodeTypesStore.getNodeType(fullNode.type, fullNode.typeVersion);
+		if (!nodeType) return acc;
+
+		const { schema, connectedOutputIndexes, itemsCount } = getNodeSchema(fullNode, node);
+
+		const filteredSchema = filterSchema(schema, props.search);
+
+		if (!filteredSchema) return acc;
+
+		acc.push({
+			node: fullNode,
+			connectedOutputIndexes,
+			depth: node.depth,
+			itemsCount,
+			nodeType,
+			schema: filteredSchema,
+		});
+		return acc;
+	}, []);
+});
+
+const nodeAdditionalInfo = (node: INodeUi) => {
+	const returnData: string[] = [];
+	if (node.disabled) {
+		returnData.push(i18n.baseText('node.disabled'));
+	}
+
+	const connections = ndvStore.ndvNodeInputNumber[node.name];
+	if (connections) {
+		if (connections.length === 1) {
+			returnData.push(`Input ${connections}`);
+		} else {
+			returnData.push(`Inputs ${connections.join(', ')}`);
+		}
+	}
+
+	return returnData.length ? `(${returnData.join(' | ')})` : '';
+};
+
+const flattenedNodes = computed(() =>
+	flattenMultipleSchemas(nodesSchemas.value, nodeAdditionalInfo),
+);
+
+const flattenNodeSchema = computed(() =>
+	nodeSchema.value ? flattenSchema({ schema: nodeSchema.value, depth: 0, level: -1 }) : [],
+);
+
+/**
+ * In debug mode nodes are empty
+ */
+const isDebugging = computed(() => !props.nodes.length);
+
+const items = computed(() => {
+	if (isDebugging.value || props.paneType === 'output') {
+		return flattenNodeSchema.value;
+	}
+
+	return flattenedNodes.value;
+});
+
+const noSearchResults = computed(() => {
+	return Boolean(props.search.trim()) && !Boolean(items.value.length);
+});
+
+const onDragStart = () => {
+	ndvStore.resetMappingTelemetry();
+};
+
+const onDragEnd = (el: HTMLElement) => {
+	setTimeout(() => {
+		const mappingTelemetry = ndvStore.mappingTelemetry;
+		const telemetryPayload = {
+			src_node_type: el.dataset.nodeType,
+			src_field_name: el.dataset.name ?? '',
+			src_nodes_back: el.dataset.depth,
+			src_run_index: props.runIndex,
+			src_runs_total: props.totalRuns,
+			src_field_nest_level: el.dataset.level ?? 0,
+			src_view: 'schema',
+			src_element: el,
+			success: false,
+			...mappingTelemetry,
+		};
+
+		void useExternalHooks().run('runDataJson.onDragEnd', telemetryPayload);
+
+		telemetry.track('User dragged data for mapping', telemetryPayload, { withPostHog: true });
+	}, 250); // ensure dest data gets set if drop
+};
+</script>
+
+<template>
+	<div class="run-data-schema full-height">
+		<div v-if="noSearchResults" class="no-results">
+			<N8nText tag="h3" size="large">{{ i18n.baseText('ndv.search.noNodeMatch.title') }}</N8nText>
+			<N8nText>
+				<i18n-t keypath="ndv.search.noMatch.description" tag="span">
+					<template #link>
+						<a href="#" @click="emit('clear:search')">
+							{{ i18n.baseText('ndv.search.noMatch.description.link') }}
+						</a>
+					</template>
+				</i18n-t>
+			</N8nText>
+
+			<N8nText v-if="paneType === 'output'">
+				{{ i18n.baseText('ndv.search.noMatchSchema.description') }}
+			</N8nText>
+		</div>
+
+		<Draggable
+			v-if="items.length"
+			class="full-height"
+			type="mapping"
+			target-data-key="mappable"
+			:disabled="!mappingEnabled"
+			@dragstart="onDragStart"
+			@dragend="onDragEnd"
+		>
+			<template #preview="{ canDrop, el }">
+				<MappingPill v-if="el" :html="el.outerHTML" :can-drop="canDrop" />
+			</template>
+			<DynamicScroller
+				ref="scroller"
+				:items="items"
+				:min-item-size="38"
+				class="full-height scroller"
+			>
+				<template #default="{ item, index, active }">
+					<VirtualSchemaHeader
+						v-if="item.type === 'header'"
+						v-bind="item"
+						:collapsed="closedNodes.has(item.id)"
+						@click:toggle="toggleLeaf(item.id)"
+						@click="toggleNodeAndScrollTop(item.id)"
+					/>
+					<DynamicScrollerItem
+						v-else
+						:item="item"
+						:active="active"
+						:size-dependencies="[item.value]"
+						:data-index="index"
+					>
+						<VirtualSchemaItem
+							v-bind="item"
+							:search="search"
+							:draggable="mappingEnabled"
+							:collapsed="closedNodes.has(item.id)"
+							:highlight="ndvStore.highlightDraggables"
+							@click="toggleLeaf(item.id)"
+						>
+						</VirtualSchemaItem>
+					</DynamicScrollerItem>
+				</template>
+			</DynamicScroller>
+		</Draggable>
+	</div>
+</template>
+
+<style lang="css" scoped>
+.full-height {
+	height: 100%;
+}
+.run-data-schema {
+	padding: 0;
+}
+
+.scroller {
+	padding: 0 var(--spacing-s);
+}
+
+.no-results {
+	text-align: center;
+	padding: var(--spacing-s) var(--spacing-s) var(--spacing-xl) var(--spacing-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/VirtualSchemaHeader.vue b/packages/editor-ui/src/components/VirtualSchemaHeader.vue
new file mode 100644
index 0000000000..677f88ba5c
--- /dev/null
+++ b/packages/editor-ui/src/components/VirtualSchemaHeader.vue
@@ -0,0 +1,104 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+import NodeIcon from '@/components/NodeIcon.vue';
+import { type INodeTypeDescription } from 'n8n-workflow';
+import { useI18n } from '@/composables/useI18n';
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+
+const props = defineProps<{
+	title: string;
+	info?: string;
+	collapsable: boolean;
+	collapsed: boolean;
+	nodeType: INodeTypeDescription;
+	itemCount: number | null;
+}>();
+
+const i18n = useI18n();
+const isTrigger = computed(() => props.nodeType.group.includes('trigger'));
+const emit = defineEmits<{
+	'click:toggle': [];
+}>();
+</script>
+
+<template>
+	<div class="schema-header" data-test-id="run-data-schema-header">
+		<div class="toggle" @click.capture.stop="emit('click:toggle')">
+			<FontAwesomeIcon icon="angle-down" :class="{ 'collapse-icon': true, collapsed }" />
+		</div>
+
+		<NodeIcon
+			class="icon"
+			:class="{ ['icon-trigger']: isTrigger }"
+			:node-type="nodeType"
+			:size="12"
+		/>
+		<div class="title">
+			{{ title }}
+			<span v-if="info" class="info">{{ info }}</span>
+		</div>
+		<FontAwesomeIcon v-if="isTrigger" class="trigger-icon" icon="bolt" size="xs" />
+		<div v-if="itemCount" class="item-count" data-test-id="run-data-schema-node-item-count">
+			{{ i18n.baseText('ndv.output.items', { interpolate: { count: itemCount } }) }}
+		</div>
+	</div>
+</template>
+
+<style lang="scss" scoped>
+.schema-header {
+	display: flex;
+	align-items: center;
+	padding-bottom: var(--spacing-2xs);
+	cursor: pointer;
+}
+.toggle {
+	width: 30px;
+	height: 30px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.collapse-icon {
+	transition: transform 0.2s cubic-bezier(0.19, 1, 0.22, 1);
+}
+.collapsed {
+	transform: rotateZ(-90deg);
+}
+
+.icon {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: var(--spacing-3xs);
+	border: 1px solid var(--color-foreground-light);
+	border-radius: var(--border-radius-base);
+	background-color: var(--color-background-xlight);
+	margin-right: var(--spacing-2xs);
+}
+
+.icon-trigger {
+	border-radius: 16px 4px 4px 16px;
+}
+
+.title {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+}
+
+.info {
+	margin-left: var(--spacing-2xs);
+	color: var(--color-text-light);
+	font-weight: var(--font-weight-regular);
+}
+
+.trigger-icon {
+	margin-left: var(--spacing-2xs);
+	color: var(--color-primary);
+}
+
+.item-count {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-light);
+	margin-left: auto;
+}
+</style>
diff --git a/packages/editor-ui/src/components/VirtualSchemaItem.vue b/packages/editor-ui/src/components/VirtualSchemaItem.vue
new file mode 100644
index 0000000000..84e9a49b8c
--- /dev/null
+++ b/packages/editor-ui/src/components/VirtualSchemaItem.vue
@@ -0,0 +1,142 @@
+<script lang="ts" setup>
+import TextWithHighlights from './TextWithHighlights.vue';
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+
+type Props = {
+	title?: string;
+	path?: string;
+	level?: number;
+	depth?: number;
+	expression?: string;
+	value?: string;
+	id: string;
+	icon: string;
+	collapsable?: boolean;
+	nodeType?: string;
+	highlight?: boolean;
+	draggable?: boolean;
+	collapsed?: boolean;
+	search?: string;
+};
+
+const props = defineProps<Props>();
+const emit = defineEmits<{
+	click: [];
+}>();
+</script>
+
+<template>
+	<div class="schema-item" :class="{ draggable }" data-test-id="run-data-schema-item">
+		<div class="toggle-container">
+			<div v-if="collapsable" class="toggle" @click="emit('click')">
+				<FontAwesomeIcon icon="angle-down" :class="{ 'collapse-icon': true, collapsed }" />
+			</div>
+		</div>
+		<div
+			v-if="title"
+			:data-name="title"
+			:data-path="path"
+			:data-depth="depth"
+			:data-nest-level="level"
+			:data-value="expression"
+			:data-node-type="nodeType"
+			data-target="mappable"
+			class="pill"
+			:class="{ 'pill--highlight': highlight }"
+			data-test-id="run-data-schema-node-name"
+		>
+			<FontAwesomeIcon class="type-icon" :icon size="sm" />
+			<TextWithHighlights class="title" :content="title" :search="props.search" />
+		</div>
+		<TextWithHighlights
+			data-test-id="run-data-schema-item-value"
+			class="text"
+			:content="value"
+			:search="props.search"
+		/>
+	</div>
+</template>
+
+<style lang="css" scoped>
+.schema-item {
+	display: flex;
+	margin-left: calc(var(--spacing-l) * v-bind(level));
+	align-items: baseline;
+	padding-bottom: var(--spacing-2xs);
+}
+
+.toggle-container {
+	min-width: var(--spacing-l);
+	min-height: 17px;
+}
+
+.toggle {
+	cursor: pointer;
+	display: flex;
+	justify-content: center;
+	cursor: pointer;
+	font-size: var(--font-size-s);
+}
+
+.pill {
+	display: inline-flex;
+	height: 24px;
+	padding: 0 var(--spacing-3xs);
+	border: 1px solid var(--color-foreground-light);
+	border-radius: var(--border-radius-base);
+	background-color: var(--color-background-xlight);
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+	max-width: 50%;
+	align-items: center;
+	> *:not(:first-child) {
+		margin-left: var(--spacing-3xs);
+		padding-left: var(--spacing-3xs);
+		border-left: 1px solid var(--color-foreground-light);
+	}
+}
+
+.draggable .pill.pill--highlight {
+	color: var(--color-primary);
+	border-color: var(--color-primary-tint-1);
+	background-color: var(--color-primary-tint-3);
+}
+
+.draggable .pill.pill--highlight .type-icon {
+	color: var(--color-primary);
+}
+
+.draggable .pill {
+	cursor: grab;
+}
+
+.draggable .pill:hover {
+	background-color: var(--color-background-light);
+	border-color: var(--color-foreground-base);
+}
+
+.type-icon {
+	color: var(--color-text-light);
+}
+
+.title {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	line-height: 1.5;
+}
+
+.text {
+	font-weight: var(--font-weight-normal);
+	font-size: var(--font-size-2xs);
+	margin-left: var(--spacing-2xs);
+	word-break: break-word;
+}
+
+.collapse-icon {
+	transition: transform 0.2s cubic-bezier(0.19, 1, 0.22, 1);
+}
+.collapsed {
+	transform: rotateZ(-90deg);
+}
+</style>
diff --git a/packages/editor-ui/src/components/WorkerList.ee.vue b/packages/editor-ui/src/components/WorkerList.ee.vue
index 10317df3b4..60ba947256 100644
--- a/packages/editor-ui/src/components/WorkerList.ee.vue
+++ b/packages/editor-ui/src/components/WorkerList.ee.vue
@@ -9,6 +9,7 @@ import { usePushConnection } from '@/composables/usePushConnection';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
 import { useRootStore } from '@/stores/root.store';
 import { useTelemetry } from '@/composables/useTelemetry';
+import WorkerCard from './Workers/WorkerCard.ee.vue';
 
 withDefaults(
 	defineProps<{
diff --git a/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
new file mode 100644
index 0000000000..7c1fa63139
--- /dev/null
+++ b/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
@@ -0,0 +1,1256 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`RunDataSchema.vue > renders previous nodes schema for AI tools 1`] = `
+<div
+  class="schema-header"
+  data-test-id="run-data-schema-header"
+  data-v-882a318e=""
+  data-v-d00cba9a=""
+  id="If"
+  type="header"
+>
+  <div
+    class="toggle"
+    data-v-882a318e=""
+  >
+    <font-awesome-icon-stub
+      beat="false"
+      beatfade="false"
+      border="false"
+      bounce="false"
+      class="collapse-icon"
+      data-v-882a318e=""
+      fade="false"
+      fixedwidth="false"
+      flash="false"
+      flip="false"
+      icon="angle-down"
+      inverse="false"
+      listitem="false"
+      pulse="false"
+      shake="false"
+      spin="false"
+      spinpulse="false"
+      spinreverse="false"
+      swapopacity="false"
+      symbol="false"
+    />
+  </div>
+  <div
+    class="n8n-node-icon icon icon"
+    data-v-882a318e=""
+  >
+    <div
+      class="nodeIconWrapper"
+      style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+    >
+      <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+      
+      <div
+        class="icon"
+      >
+        <img
+          class="nodeIconImage"
+        />
+        <!--v-if-->
+      </div>
+      
+    </div>
+  </div>
+  <div
+    class="title"
+    data-v-882a318e=""
+  >
+    If 
+    <!--v-if-->
+  </div>
+  <!--v-if-->
+  <div
+    class="item-count"
+    data-test-id="run-data-schema-node-item-count"
+    data-v-882a318e=""
+  >
+    2 items
+  </div>
+</div>
+`;
+
+exports[`RunDataSchema.vue > renders schema for correct output branch 1`] = `
+<div
+  class="schema-header"
+  data-test-id="run-data-schema-header"
+  data-v-882a318e=""
+  data-v-d00cba9a=""
+  id="If"
+  type="header"
+>
+  <div
+    class="toggle"
+    data-v-882a318e=""
+  >
+    <font-awesome-icon-stub
+      beat="false"
+      beatfade="false"
+      border="false"
+      bounce="false"
+      class="collapse-icon"
+      data-v-882a318e=""
+      fade="false"
+      fixedwidth="false"
+      flash="false"
+      flip="false"
+      icon="angle-down"
+      inverse="false"
+      listitem="false"
+      pulse="false"
+      shake="false"
+      spin="false"
+      spinpulse="false"
+      spinreverse="false"
+      swapopacity="false"
+      symbol="false"
+    />
+  </div>
+  <div
+    class="n8n-node-icon icon icon"
+    data-v-882a318e=""
+  >
+    <div
+      class="nodeIconWrapper"
+      style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+    >
+      <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+      
+      <div
+        class="icon"
+      >
+        <img
+          class="nodeIconImage"
+        />
+        <!--v-if-->
+      </div>
+      
+    </div>
+  </div>
+  <div
+    class="title"
+    data-v-882a318e=""
+  >
+    If 
+    <!--v-if-->
+  </div>
+  <!--v-if-->
+  <div
+    class="item-count"
+    data-test-id="run-data-schema-node-item-count"
+    data-v-882a318e=""
+  >
+    2 items
+  </div>
+</div>
+`;
+
+exports[`RunDataSchema.vue > renders schema in output pane 1`] = `
+<div>
+  <div
+    class="run-data-schema full-height"
+    data-v-d00cba9a=""
+  >
+    <!--v-if-->
+    <div
+      class="full-height"
+      data-v-d00cba9a=""
+    >
+      
+      <div
+        class="full-height scroller"
+        data-v-d00cba9a=""
+        min-item-size="38"
+      >
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill"
+            data-depth="0"
+            data-name="name"
+            data-nest-level="0"
+            data-node-type=""
+            data-path=".name"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $('').item.json.name }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="font"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                name
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              John
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill"
+            data-depth="0"
+            data-name="age"
+            data-nest-level="0"
+            data-node-type=""
+            data-path=".age"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $('').item.json.age }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="hashtag"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                age
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              22
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <div
+              class="toggle"
+              data-v-0f5e7239=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-0f5e7239=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+          </div>
+          <div
+            class="pill"
+            data-depth="0"
+            data-name="hobbies"
+            data-nest-level="0"
+            data-node-type=""
+            data-path=".hobbies"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $('').item.json.hobbies }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="list"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                hobbies
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            <span />
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill"
+            data-depth="0"
+            data-name="hobbies[0]"
+            data-nest-level="1"
+            data-node-type=""
+            data-path=".hobbies[0]"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $('').item.json.hobbies[0] }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="font"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                hobbies[0]
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              surfing
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill"
+            data-depth="0"
+            data-name="hobbies[1]"
+            data-nest-level="1"
+            data-node-type=""
+            data-path=".hobbies[1]"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $('').item.json.hobbies[1] }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="font"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                hobbies[1]
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              traveling
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+      </div>
+      
+      <!--teleport start-->
+      <!--teleport end-->
+    </div>
+  </div>
+</div>
+`;
+
+exports[`RunDataSchema.vue > renders schema with spaces and dots 1`] = `
+<div>
+  <div
+    class="run-data-schema full-height"
+    data-v-d00cba9a=""
+  >
+    <!--v-if-->
+    <div
+      class="full-height"
+      data-v-d00cba9a=""
+    >
+      
+      <div
+        class="full-height scroller"
+        data-v-d00cba9a=""
+        min-item-size="38"
+      >
+        
+        
+        <div
+          class="schema-header"
+          data-test-id="run-data-schema-header"
+          data-v-882a318e=""
+          data-v-d00cba9a=""
+          id="Manual Trigger"
+          type="header"
+        >
+          <div
+            class="toggle"
+            data-v-882a318e=""
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="collapse-icon"
+              data-v-882a318e=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="angle-down"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+          </div>
+          <div
+            class="n8n-node-icon icon icon-trigger icon icon-trigger"
+            data-v-882a318e=""
+          >
+            <div
+              class="nodeIconWrapper"
+              style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+            >
+              <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+              
+              <div
+                class="icon"
+              >
+                <img
+                  class="nodeIconImage"
+                />
+                <!--v-if-->
+              </div>
+              
+            </div>
+          </div>
+          <div
+            class="title"
+            data-v-882a318e=""
+          >
+            Manual Trigger 
+            <!--v-if-->
+          </div>
+          <font-awesome-icon-stub
+            beat="false"
+            beatfade="false"
+            border="false"
+            bounce="false"
+            class="trigger-icon"
+            data-v-882a318e=""
+            fade="false"
+            fixedwidth="false"
+            flash="false"
+            flip="false"
+            icon="bolt"
+            inverse="false"
+            listitem="false"
+            pulse="false"
+            shake="false"
+            size="xs"
+            spin="false"
+            spinpulse="false"
+            spinreverse="false"
+            swapopacity="false"
+            symbol="false"
+          />
+          <div
+            class="item-count"
+            data-test-id="run-data-schema-node-item-count"
+            data-v-882a318e=""
+          >
+            1 item
+          </div>
+        </div>
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <div
+              class="toggle"
+              data-v-0f5e7239=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-0f5e7239=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+          </div>
+          <div
+            class="pill"
+            data-depth="1"
+            data-name="hello world"
+            data-nest-level="1"
+            data-node-type="n8n-nodes-base.manualTrigger"
+            data-path="['hello world']"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $json['hello world'] }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="list"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                hello world
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            <span />
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <div
+              class="toggle"
+              data-v-0f5e7239=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-0f5e7239=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+          </div>
+          <div
+            class="pill"
+            data-depth="1"
+            data-name="hello world[0]"
+            data-nest-level="2"
+            data-node-type="n8n-nodes-base.manualTrigger"
+            data-path="['hello world'][0]"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $json['hello world'][0] }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="cube"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                hello world[0]
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            <span />
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <div
+              class="toggle"
+              data-v-0f5e7239=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-0f5e7239=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+          </div>
+          <div
+            class="pill"
+            data-depth="1"
+            data-name="test"
+            data-nest-level="3"
+            data-node-type="n8n-nodes-base.manualTrigger"
+            data-path="['hello world'][0].test"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $json['hello world'][0].test }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="cube"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                test
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            <span />
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill"
+            data-depth="1"
+            data-name="more to think about"
+            data-nest-level="4"
+            data-node-type="n8n-nodes-base.manualTrigger"
+            data-path="['hello world'][0].test['more to think about']"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $json['hello world'][0].test['more to think about'] }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="hashtag"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                more to think about
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              1
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill"
+            data-depth="1"
+            data-name="test.how"
+            data-nest-level="3"
+            data-node-type="n8n-nodes-base.manualTrigger"
+            data-path="['hello world'][0]['test.how']"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $json['hello world'][0]['test.how'] }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="font"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                test.how
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              ignore
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+        <div
+          class="schema-header"
+          data-test-id="run-data-schema-header"
+          data-v-882a318e=""
+          data-v-d00cba9a=""
+          id="Set2"
+          type="header"
+        >
+          <div
+            class="toggle"
+            data-v-882a318e=""
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="collapse-icon"
+              data-v-882a318e=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="angle-down"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+          </div>
+          <div
+            class="n8n-node-icon icon icon"
+            data-v-882a318e=""
+          >
+            <div
+              class="nodeIconWrapper"
+              style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+            >
+              <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+              
+              <div
+                class="icon"
+              >
+                <img
+                  class="nodeIconImage"
+                />
+                <!--v-if-->
+              </div>
+              
+            </div>
+          </div>
+          <div
+            class="title"
+            data-v-882a318e=""
+          >
+            Set2 
+            <!--v-if-->
+          </div>
+          <!--v-if-->
+          <!--v-if-->
+        </div>
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <!--v-if-->
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              No fields - item(s) exist, but they're empty
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+      </div>
+      
+      <!--teleport start-->
+      <!--teleport end-->
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/editor-ui/src/components/canvas/Canvas.test.ts b/packages/editor-ui/src/components/canvas/Canvas.test.ts
index beaa38edb2..afeb69479c 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.test.ts
+++ b/packages/editor-ui/src/components/canvas/Canvas.test.ts
@@ -87,8 +87,6 @@ describe('Canvas', () => {
 	});
 
 	it('should handle `update:nodes:position` event', async () => {
-		vi.useFakeTimers();
-
 		const nodes = [createCanvasNodeElement()];
 		const { container, emitted } = renderComponent({
 			props: {
@@ -112,8 +110,6 @@ describe('Canvas', () => {
 		});
 		await fireEvent.mouseUp(node, { view: window });
 
-		vi.advanceTimersByTime(250); // Event debounce time
-
 		expect(emitted()['update:nodes:position']).toEqual([
 			[
 				[
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index f72f75b4e6..d2fb227635 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -6,13 +6,7 @@ import type {
 	CanvasEventBusEvents,
 	ConnectStartEvent,
 } from '@/types';
-import type {
-	Connection,
-	XYPosition,
-	ViewportTransform,
-	NodeDragEvent,
-	GraphNode,
-} from '@vue-flow/core';
+import type { Connection, XYPosition, NodeDragEvent, GraphNode } from '@vue-flow/core';
 import { useVueFlow, VueFlow, PanelPosition, MarkerType } from '@vue-flow/core';
 import { Background } from '@vue-flow/background';
 import { MiniMap } from '@vue-flow/minimap';
@@ -29,10 +23,11 @@ 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, useThrottleFn } from '@vueuse/core';
 import CanvasArrowHeadMarker from './elements/edges/CanvasArrowHeadMarker.vue';
 import CanvasBackgroundStripedPattern from './elements/CanvasBackgroundStripedPattern.vue';
 import { useCanvasTraversal } from '@/composables/useCanvasTraversal';
+import { NodeConnectionType } from 'n8n-workflow';
 
 const $style = useCssModule();
 
@@ -113,8 +108,14 @@ const {
 	project,
 	nodes: graphNodes,
 	onPaneReady,
+	onNodesInitialized,
 	findNode,
 	viewport,
+	onEdgeMouseLeave,
+	onEdgeMouseEnter,
+	onEdgeMouseMove,
+	onNodeMouseEnter,
+	onNodeMouseLeave,
 } = vueFlow;
 const {
 	getIncomingNodes,
@@ -265,6 +266,10 @@ function onNodeDragStop(event: NodeDragEvent) {
 	onUpdateNodesPosition(event.nodes.map(({ id, position }) => ({ id, position })));
 }
 
+function onSelectionDragStop(event: NodeDragEvent) {
+	onUpdateNodesPosition(event.nodes.map(({ id, position }) => ({ id, position })));
+}
+
 function onSetNodeActive(id: string) {
 	props.eventBus.emit('nodes:action', { ids: [id], action: 'update:node:active' });
 	emit('update:node:active', id);
@@ -297,7 +302,7 @@ function onUpdateNodeParameters(id: string, parameters: Record<string, unknown>)
 }
 
 /**
- * Connections
+ * Connections / Edges
  */
 
 const connectionCreated = ref(false);
@@ -339,6 +344,57 @@ function onClickConnectionAdd(connection: Connection) {
 
 const arrowHeadMarkerId = ref('custom-arrow-head');
 
+/**
+ * Edge and Nodes Hovering
+ */
+
+const edgesHoveredById = ref<Record<string, boolean>>({});
+const edgesBringToFrontById = ref<Record<string, boolean>>({});
+
+onEdgeMouseEnter(({ edge }) => {
+	edgesBringToFrontById.value = { [edge.id]: true };
+	edgesHoveredById.value = { [edge.id]: true };
+});
+
+onEdgeMouseMove(
+	useThrottleFn(({ edge, event }) => {
+		const type = edge.data.source.type;
+		if (type !== NodeConnectionType.AiTool) {
+			return;
+		}
+
+		if (!edge.data.maxConnections || edge.data.maxConnections > 1) {
+			const projectedPosition = getProjectedPosition(event);
+			const yDiff = projectedPosition.y - edge.targetY;
+			if (yDiff < 4 * GRID_SIZE) {
+				edgesBringToFrontById.value = { [edge.id]: false };
+			} else {
+				edgesBringToFrontById.value = { [edge.id]: true };
+			}
+		}
+	}, 100),
+);
+
+onEdgeMouseLeave(({ edge }) => {
+	edgesBringToFrontById.value = { [edge.id]: false };
+	edgesHoveredById.value = { [edge.id]: false };
+});
+
+function onUpdateEdgeLabelHovered(id: string, hovered: boolean) {
+	edgesBringToFrontById.value = { [id]: true };
+	edgesHoveredById.value[id] = hovered;
+}
+
+const nodesHoveredById = ref<Record<string, boolean>>({});
+
+onNodeMouseEnter(({ node }) => {
+	nodesHoveredById.value = { [node.id]: true };
+});
+
+onNodeMouseLeave(({ node }) => {
+	nodesHoveredById.value = { [node.id]: false };
+});
+
 /**
  * Executions
  */
@@ -372,10 +428,9 @@ function emitWithLastSelectedNode(emitFn: (id: string) => void) {
  */
 
 const defaultZoom = 1;
-const zoom = ref(defaultZoom);
 const isPaneMoving = ref(false);
 
-function getProjectedPosition(event?: MouseEvent) {
+function getProjectedPosition(event?: Pick<MouseEvent, 'clientX' | 'clientY'>) {
 	const bounds = viewportRef.value?.getBoundingClientRect() ?? { left: 0, top: 0 };
 	const offsetX = event?.clientX ?? 0;
 	const offsetY = event?.clientY ?? 0;
@@ -410,10 +465,6 @@ async function onResetZoom() {
 	await onZoomTo(defaultZoom);
 }
 
-function onViewportChange(viewport: ViewportTransform) {
-	zoom.value = viewport.zoom;
-}
-
 function setReadonly(value: boolean) {
 	setInteractive(!value);
 	elementsSelectable.value = true;
@@ -530,6 +581,8 @@ function onMinimapMouseLeave() {
  * Lifecycle
  */
 
+const initialized = ref(false);
+
 onMounted(() => {
 	props.eventBus.on('fitView', onFitView);
 	props.eventBus.on('nodes:select', onSelectNodes);
@@ -545,6 +598,10 @@ onPaneReady(async () => {
 	isPaneReady.value = true;
 });
 
+onNodesInitialized(() => {
+	initialized.value = true;
+});
+
 watch(() => props.readOnly, setReadonly, {
 	immediate: true,
 });
@@ -558,6 +615,8 @@ const isExecuting = toRef(props, 'executing');
 provide(CanvasKey, {
 	connectingHandle,
 	isExecuting,
+	initialized,
+	viewport,
 });
 </script>
 
@@ -585,16 +644,17 @@ provide(CanvasKey, {
 		@connect-end="onConnectEnd"
 		@pane-click="onClickPane"
 		@contextmenu="onOpenContextMenu"
-		@viewport-change="onViewportChange"
 		@move-start="onPaneMoveStart"
 		@move-end="onPaneMoveEnd"
 		@node-drag-stop="onNodeDragStop"
+		@selection-drag-stop="onSelectionDragStop"
 	>
-		<template #node-canvas-node="canvasNodeProps">
+		<template #node-canvas-node="nodeProps">
 			<Node
-				v-bind="canvasNodeProps"
+				v-bind="nodeProps"
 				:read-only="readOnly"
 				:event-bus="eventBus"
+				:hovered="nodesHoveredById[nodeProps.id]"
 				@delete="onDeleteNode"
 				@run="onRunNode"
 				@select="onSelectNode"
@@ -607,13 +667,16 @@ provide(CanvasKey, {
 			/>
 		</template>
 
-		<template #edge-canvas-edge="canvasEdgeProps">
+		<template #edge-canvas-edge="edgeProps">
 			<Edge
-				v-bind="canvasEdgeProps"
+				v-bind="edgeProps"
 				:marker-end="`url(#${arrowHeadMarkerId})`"
 				:read-only="readOnly"
+				:hovered="edgesHoveredById[edgeProps.id]"
+				:bring-to-front="edgesBringToFrontById[edgeProps.id]"
 				@add="onClickConnectionAdd"
 				@delete="onDeleteConnection"
+				@update:label:hovered="onUpdateEdgeLabelHovered(edgeProps.id, $event)"
 			/>
 		</template>
 
@@ -652,7 +715,7 @@ provide(CanvasKey, {
 			:position="controlsPosition"
 			:show-interactive="false"
 			:show-bug-reporting-button="showBugReportingButton"
-			:zoom="zoom"
+			:zoom="viewport.zoom"
 			@zoom-to-fit="onFitView"
 			@zoom-in="onZoomIn"
 			@zoom-out="onZoomOut"
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue
index 034b16752a..92a1ff8128 100644
--- a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue
@@ -1,17 +1,16 @@
 <script lang="ts" setup>
 export interface Props {
-	outline?: boolean;
+	type: 'primary' | 'tertiary';
+	label: string;
 }
-
 defineProps<Props>();
 </script>
 <template>
 	<N8nButton
-		label="Chat"
+		:label="label"
 		size="large"
 		icon="comment"
-		type="primary"
-		:outline="outline"
+		:type="type"
 		data-test-id="workflow-chat-button"
 	/>
 </template>
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
index d5e08f213e..b2fe2141e0 100644
--- a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
@@ -1,3 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`CanvasChatButton > should render correctly 1`] = `"<button class="button button primary large withIcon" aria-live="polite" data-test-id="workflow-chat-button"><span class="icon"><span class="n8n-text compact size-large regular n8n-icon n8n-icon"><svg class="svg-inline--fa fa-comment fa-w-16 large" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="comment" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path class="" fill="currentColor" d="M256 32C114.6 32 0 125.1 0 240c0 49.6 21.4 95 57 130.7C44.5 421.1 2.7 466 2.2 466.5c-2.2 2.3-2.8 5.7-1.5 8.7S4.8 480 8 480c66.3 0 116-31.8 140.6-51.4 32.7 12.3 69 19.4 107.4 19.4 141.4 0 256-93.1 256-208S397.4 32 256 32z"></path></svg></span></span><span>Chat</span></button>"`;
+exports[`CanvasChatButton > should render correctly 1`] = `
+"<button class="button button primary large withIcon" aria-live="polite" data-test-id="workflow-chat-button"><span class="icon"><span class="n8n-text compact size-large regular n8n-icon n8n-icon"><svg class="svg-inline--fa fa-comment fa-w-16 large" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="comment" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path class="" fill="currentColor" d="M256 32C114.6 32 0 125.1 0 240c0 49.6 21.4 95 57 130.7C44.5 421.1 2.7 466 2.2 466.5c-2.2 2.3-2.8 5.7-1.5 8.7S4.8 480 8 480c66.3 0 116-31.8 140.6-51.4 32.7 12.3 69 19.4 107.4 19.4 141.4 0 256-93.1 256-208S397.4 32 256 32z"></path></svg></span></span>
+  <!--v-if-->
+</button>"
+`;
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
index 812dd7effc..8b99a45090 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
@@ -4,6 +4,7 @@ import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import type { ConnectionLineProps } from '@vue-flow/core';
 import { Position } from '@vue-flow/core';
+import { createCanvasProvide } from '@/__tests__/data';
 
 const DEFAULT_PROPS = {
 	sourceX: 0,
@@ -15,6 +16,11 @@ const DEFAULT_PROPS = {
 } satisfies Partial<ConnectionLineProps>;
 const renderComponent = createComponentRenderer(CanvasConnectionLine, {
 	props: DEFAULT_PROPS,
+	global: {
+		provide: {
+			...createCanvasProvide(),
+		},
+	},
 });
 
 beforeEach(() => {
@@ -46,32 +52,15 @@ describe('CanvasConnectionLine', () => {
 			},
 		});
 
-		const edge = container.querySelector('.vue-flow__edge-path');
+		const edges = container.querySelectorAll('.vue-flow__edge-path');
 
-		expect(edge).toHaveAttribute(
+		expect(edges[0]).toHaveAttribute(
 			'd',
-			'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',
+			'M0 0L 24,0Q 40,0 40,16L 40,114Q 40,130 24,130L-10 130L-50 130',
 		);
-	});
-
-	it('should only avoid obstacles when the edge intersects the nodes ', () => {
-		const { container } = renderComponent({
-			props: {
-				...DEFAULT_PROPS,
-				sourceX: -72,
-				sourceY: -290,
-				sourcePosition: Position.Right,
-				targetX: -344,
-				targetY: -30,
-				targetPosition: Position.Left,
-			},
-		});
-
-		const edge = container.querySelector('.vue-flow__edge-path');
-
-		expect(edge).toHaveAttribute(
+		expect(edges[1]).toHaveAttribute(
 			'd',
-			'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',
+			'M-50 130L-90 130L -124,130Q -140,130 -140,114L -140,-84Q -140,-100 -124,-100L-100 -100',
 		);
 	});
 });
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 8cb47fab93..dddf41c959 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
@@ -3,7 +3,7 @@
 import type { ConnectionLineProps } from '@vue-flow/core';
 import { BaseEdge } from '@vue-flow/core';
 import { computed, useCssModule } from 'vue';
-import { getCustomPath } from './utils/edgePath';
+import { getEdgeRenderData } from './utils';
 import { useCanvas } from '@/composables/useCanvas';
 import { NodeConnectionType } from 'n8n-workflow';
 import { parseCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
@@ -32,11 +32,22 @@ const edgeStyle = computed(() => ({
 	stroke: edgeColor.value,
 }));
 
-const path = computed(() => getCustomPath(props, { connectionType: connectionType.value }));
+const renderData = computed(() =>
+	getEdgeRenderData(props, { connectionType: connectionType.value }),
+);
+
+const segments = computed(() => renderData.value.segments);
 </script>
 
 <template>
-	<BaseEdge :class="$style.edge" :style="edgeStyle" :path="path[0]" :marker-end="markerEnd" />
+	<BaseEdge
+		v-for="segment in segments"
+		:key="segment[0]"
+		:class="$style.edge"
+		:style="edgeStyle"
+		:path="segment[0]"
+		:marker-end="markerEnd"
+	/>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
index 6a8ce9e789..6e5e1ca876 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
@@ -30,7 +30,11 @@ beforeEach(() => {
 
 describe('CanvasEdge', () => {
 	it('should emit delete event when toolbar delete is clicked', async () => {
-		const { emitted, getByTestId } = renderComponent();
+		const { emitted, getByTestId } = renderComponent({
+			props: {
+				hovered: true,
+			},
+		});
 		await userEvent.hover(getByTestId('edge-label-wrapper'));
 		const deleteButton = getByTestId('delete-connection-button');
 
@@ -40,7 +44,11 @@ describe('CanvasEdge', () => {
 	});
 
 	it('should emit add event when toolbar add is clicked', async () => {
-		const { emitted, getByTestId } = renderComponent();
+		const { emitted, getByTestId } = renderComponent({
+			props: {
+				hovered: true,
+			},
+		});
 		await userEvent.hover(getByTestId('edge-label-wrapper'));
 
 		const addButton = getByTestId('add-connection-button');
@@ -120,11 +128,15 @@ describe('CanvasEdge', () => {
 			},
 		});
 
-		const edge = container.querySelector('.vue-flow__edge-path');
+		const edges = container.querySelectorAll('.vue-flow__edge-path');
 
-		expect(edge).toHaveAttribute(
+		expect(edges[0]).toHaveAttribute(
 			'd',
-			'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',
+			'M0 0L 24,0Q 40,0 40,16L 40,114Q 40,130 24,130L-10 130L-50 130',
+		);
+		expect(edges[1]).toHaveAttribute(
+			'd',
+			'M-50 130L-90 130L -124,130Q -140,130 -140,114L -140,-84Q -140,-100 -124,-100L-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 f23d3c6c33..056878636e 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
@@ -3,40 +3,28 @@
 import type { CanvasConnectionData } from '@/types';
 import { isValidNodeConnectionType } from '@/utils/typeGuards';
 import type { Connection, EdgeProps } from '@vue-flow/core';
-import { useVueFlow, BaseEdge, EdgeLabelRenderer } from '@vue-flow/core';
+import { BaseEdge, EdgeLabelRenderer } from '@vue-flow/core';
 import { NodeConnectionType } from 'n8n-workflow';
-import { computed, useCssModule, ref, toRef } from 'vue';
+import { computed, useCssModule, toRef } from 'vue';
 import CanvasEdgeToolbar from './CanvasEdgeToolbar.vue';
-import { getCustomPath } from './utils/edgePath';
+import { getEdgeRenderData } from './utils';
 
 const emit = defineEmits<{
 	add: [connection: Connection];
 	delete: [connection: Connection];
+	'update:label:hovered': [hovered: boolean];
 }>();
 
 export type CanvasEdgeProps = EdgeProps<CanvasConnectionData> & {
 	readOnly?: boolean;
 	hovered?: boolean;
+	bringToFront?: boolean; // Determines if entire edges layer should be brought to front
 };
 
 const props = defineProps<CanvasEdgeProps>();
 
 const data = toRef(props, 'data');
 
-const { onEdgeMouseEnter, onEdgeMouseLeave } = useVueFlow();
-
-const isHovered = ref(false);
-
-onEdgeMouseEnter(({ edge }) => {
-	if (edge.id !== props.id) return;
-	isHovered.value = true;
-});
-
-onEdgeMouseLeave(({ edge }) => {
-	if (edge.id !== props.id) return;
-	isHovered.value = false;
-});
-
 const $style = useCssModule();
 
 const connectionType = computed(() =>
@@ -45,7 +33,7 @@ const connectionType = computed(() =>
 		: NodeConnectionType.Main,
 );
 
-const renderToolbar = computed(() => isHovered.value && !props.readOnly);
+const renderToolbar = computed(() => props.hovered && !props.readOnly);
 
 const isMainConnection = computed(() => data.value.source.type === NodeConnectionType.Main);
 
@@ -71,12 +59,13 @@ const edgeStyle = computed(() => ({
 	...props.style,
 	...(isMainConnection.value ? {} : { strokeDasharray: '8,8' }),
 	strokeWidth: 2,
-	stroke: isHovered.value ? 'var(--color-primary)' : edgeColor.value,
+	stroke: props.hovered ? 'var(--color-primary)' : edgeColor.value,
 }));
 
 const edgeClasses = computed(() => ({
 	[$style.edge]: true,
-	hovered: isHovered.value,
+	hovered: props.hovered,
+	'bring-to-front': props.bringToFront,
 }));
 
 const edgeLabelStyle = computed(() => ({
@@ -84,10 +73,9 @@ const edgeLabelStyle = computed(() => ({
 }));
 
 const edgeToolbarStyle = computed(() => {
-	const [, labelX, labelY] = path.value;
 	return {
-		transform: `translate(-50%, -50%) translate(${labelX}px,${labelY}px)`,
-		...(isHovered.value ? { zIndex: 1 } : {}),
+		transform: `translate(-50%, -50%) translate(${labelPosition.value[0]}px,${labelPosition.value[1]}px)`,
+		...(props.hovered ? { zIndex: 1 } : {}),
 	};
 });
 
@@ -97,12 +85,16 @@ const edgeToolbarClasses = computed(() => ({
 	selected: props.selected,
 }));
 
-const path = computed(() =>
-	getCustomPath(props, {
+const renderData = computed(() =>
+	getEdgeRenderData(props, {
 		connectionType: connectionType.value,
 	}),
 );
 
+const segments = computed(() => renderData.value.segments);
+
+const labelPosition = computed(() => renderData.value.labelPosition);
+
 const connection = computed<Connection>(() => ({
 	source: props.source,
 	target: props.target,
@@ -117,14 +109,24 @@ function onAdd() {
 function onDelete() {
 	emit('delete', connection.value);
 }
+
+function onEdgeLabelMouseEnter() {
+	emit('update:label:hovered', true);
+}
+
+function onEdgeLabelMouseLeave() {
+	emit('update:label:hovered', false);
+}
 </script>
 
 <template>
 	<BaseEdge
-		:id="id"
+		v-for="(segment, index) in segments"
+		:id="`${id}-${index}`"
+		:key="segment[0]"
 		:class="edgeClasses"
 		:style="edgeStyle"
-		:path="path[0]"
+		:path="segment[0]"
 		:marker-end="markerEnd"
 		:interaction-width="40"
 	/>
@@ -137,8 +139,8 @@ function onDelete() {
 			:data-edge-status="status"
 			:style="edgeToolbarStyle"
 			:class="edgeToolbarClasses"
-			@mouseenter="isHovered = true"
-			@mouseleave="isHovered = false"
+			@mouseenter="onEdgeLabelMouseEnter"
+			@mouseleave="onEdgeLabelMouseLeave"
 		>
 			<CanvasEdgeToolbar
 				v-if="renderToolbar"
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
deleted file mode 100644
index 053fda35a1..0000000000
--- a/packages/editor-ui/src/components/canvas/elements/edges/utils/edgePath.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { EdgeProps } from '@vue-flow/core';
-import { getBezierPath, getSmoothStepPath, Position } from '@vue-flow/core';
-import { NodeConnectionType } from 'n8n-workflow';
-
-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 isRightOfSourceHandle = (sourceX: number, targetX: number) => sourceX - HANDLE_SIZE > targetX;
-
-const pathIntersectsNodes = (targetY: number, sourceY: number) =>
-	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 (!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_BOTTOM || yDiff > 0 ? 'up' : 'down';
-		const firstSegmentTargetX = sourceX;
-		const firstSegmentTargetY =
-			sourceY + (direction === 'up' ? -EDGE_PADDING_TOP : EDGE_PADDING_BOTTOM);
-		const [firstSegmentPath] = getSmoothStepPath({
-			sourceX,
-			sourceY,
-			targetX: firstSegmentTargetX,
-			targetY: firstSegmentTargetY,
-			sourcePosition,
-			targetPosition: Position.Right,
-			borderRadius: EDGE_BORDER_RADIUS,
-			offset: EDGE_PADDING_X,
-		});
-		const path = getSmoothStepPath({
-			sourceX: firstSegmentTargetX,
-			sourceY: firstSegmentTargetY,
-			targetX,
-			targetY,
-			sourcePosition: Position.Left,
-			targetPosition,
-			borderRadius: EDGE_BORDER_RADIUS,
-			offset: EDGE_PADDING_X,
-		});
-
-		path[0] = firstSegmentPath + path[0];
-		return path;
-	}
-
-	return getSmoothStepPath({
-		...props,
-		borderRadius: EDGE_BORDER_RADIUS,
-	});
-}
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts b/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
new file mode 100644
index 0000000000..848ce5a875
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
@@ -0,0 +1,63 @@
+import type { EdgeProps } from '@vue-flow/core';
+import { getBezierPath, getSmoothStepPath, Position } from '@vue-flow/core';
+import { NodeConnectionType } from 'n8n-workflow';
+
+const EDGE_PADDING_BOTTOM = 130;
+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 isRightOfSourceHandle = (sourceX: number, targetX: number) => sourceX - HANDLE_SIZE > targetX;
+
+export function getEdgeRenderData(
+	props: Pick<
+		EdgeProps,
+		'sourceX' | 'sourceY' | 'sourcePosition' | 'targetX' | 'targetY' | 'targetPosition'
+	>,
+	{
+		connectionType = NodeConnectionType.Main,
+	}: {
+		connectionType?: NodeConnectionType;
+	} = {},
+) {
+	const { targetX, targetY, sourceX, sourceY, sourcePosition, targetPosition } = props;
+
+	if (!isRightOfSourceHandle(sourceX, targetX) || connectionType !== NodeConnectionType.Main) {
+		const segment = getBezierPath(props);
+		return {
+			segments: [segment],
+			labelPosition: [segment[1], segment[2]],
+		};
+	}
+
+	// Connection is backwards and the source is on the right side
+	// -> We need to avoid overlapping the source node
+	const firstSegmentTargetX = (sourceX + targetX) / 2;
+	const firstSegmentTargetY = sourceY + EDGE_PADDING_BOTTOM;
+	const firstSegment = getSmoothStepPath({
+		sourceX,
+		sourceY,
+		targetX: firstSegmentTargetX,
+		targetY: firstSegmentTargetY,
+		sourcePosition,
+		targetPosition: Position.Right,
+		borderRadius: EDGE_BORDER_RADIUS,
+		offset: EDGE_PADDING_X,
+	});
+
+	const secondSegment = getSmoothStepPath({
+		sourceX: firstSegmentTargetX,
+		sourceY: firstSegmentTargetY,
+		targetX,
+		targetY,
+		sourcePosition: Position.Left,
+		targetPosition,
+		borderRadius: EDGE_BORDER_RADIUS,
+		offset: EDGE_PADDING_X,
+	});
+
+	return {
+		segments: [firstSegment, secondSegment],
+		labelPosition: [firstSegmentTargetX, firstSegmentTargetY],
+	};
+}
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/utils/index.ts b/packages/editor-ui/src/components/canvas/elements/edges/utils/index.ts
new file mode 100644
index 0000000000..b3066c008f
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/edges/utils/index.ts
@@ -0,0 +1 @@
+export * from './getEdgeRenderData';
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 1f312c7136..613662c00e 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue
@@ -126,6 +126,7 @@ const mode = toRef(props, 'mode');
 const type = toRef(props, 'type');
 const index = toRef(props, 'index');
 const isRequired = toRef(props, 'required');
+const maxConnections = toRef(props, 'maxConnections');
 
 provide(CanvasNodeHandleKey, {
 	label,
@@ -137,6 +138,7 @@ provide(CanvasNodeHandleKey, {
 	isConnected,
 	isConnecting,
 	isReadOnly,
+	maxConnections,
 });
 </script>
 
@@ -155,6 +157,7 @@ provide(CanvasNodeHandleKey, {
 		<RenderType
 			:class="renderTypeClasses"
 			:is-connected="isConnected"
+			:max-connections="maxConnections"
 			:style="offset"
 			:label="label"
 			@add="onAdd"
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 bd03ffdd9e..be3548dc38 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
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 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, useCssModule } from 'vue';
 
 const emit = defineEmits<{
@@ -10,7 +9,7 @@ const emit = defineEmits<{
 
 const $style = useCssModule();
 
-const { label, isConnected, isConnecting, isRequired, type } = useCanvasNodeHandle();
+const { label, isConnected, isConnecting, isRequired, maxConnections } = useCanvasNodeHandle();
 
 const handleClasses = 'target';
 
@@ -20,14 +19,12 @@ const classes = computed(() => ({
 	[$style.required]: isRequired.value,
 }));
 
-const supportsMultipleConnections = computed(() => type.value === NodeConnectionType.AiTool);
-
 const isHandlePlusAvailable = computed(
-	() => !isConnected.value || supportsMultipleConnections.value,
+	() => !isConnected.value || !maxConnections.value || maxConnections.value > 1,
 );
 
 const isHandlePlusVisible = computed(
-	() => !isConnecting.value || isHovered.value || supportsMultipleConnections.value,
+	() => !isConnecting.value || isHovered.value || !maxConnections.value || maxConnections.value > 1,
 );
 
 const isHovered = ref(false);
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 3da94d6f26..78f4d250af 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
@@ -156,18 +156,18 @@ function onClick(event: MouseEvent) {
 			stroke: var(--color-success);
 		}
 	}
-}
 
-.plus {
-	&:hover {
-		cursor: pointer;
+	.plus {
+		&:hover {
+			cursor: pointer;
 
-		path {
-			fill: var(--color-primary);
-		}
+			path {
+				fill: var(--color-primary);
+			}
 
-		rect {
-			stroke: var(--color-primary);
+			rect {
+				stroke: var(--color-primary);
+			}
 		}
 	}
 }
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
index 31818cc93a..6b72cdf037 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
@@ -3,7 +3,7 @@ import { createComponentRenderer } from '@/__tests__/render';
 import { createPinia, setActivePinia } from 'pinia';
 import { NodeConnectionType } from 'n8n-workflow';
 import { fireEvent } from '@testing-library/vue';
-import { createCanvasNodeProps } from '@/__tests__/data';
+import { createCanvasNodeProps, createCanvasProvide } from '@/__tests__/data';
 
 vi.mock('@/stores/nodeTypes.store', () => ({
 	useNodeTypesStore: vi.fn(() => ({
@@ -19,7 +19,14 @@ beforeEach(() => {
 	const pinia = createPinia();
 	setActivePinia(pinia);
 
-	renderComponent = createComponentRenderer(CanvasNode, { pinia });
+	renderComponent = createComponentRenderer(CanvasNode, {
+		pinia,
+		global: {
+			provide: {
+				...createCanvasProvide(),
+			},
+		},
+	});
 });
 
 describe('CanvasNode', () => {
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 09c6868b75..e62046d5d7 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -1,5 +1,14 @@
 <script lang="ts" setup>
-import { computed, onBeforeUnmount, onMounted, provide, ref, toRef, watch } from 'vue';
+import {
+	computed,
+	onBeforeUnmount,
+	onMounted,
+	provide,
+	ref,
+	toRef,
+	useCssModule,
+	watch,
+} from 'vue';
 import type {
 	CanvasConnectionPort,
 	CanvasElementPortWithRenderData,
@@ -26,6 +35,7 @@ import { createEventBus } from 'n8n-design-system';
 type Props = NodeProps<CanvasNodeData> & {
 	readOnly?: boolean;
 	eventBus?: EventBus<CanvasEventBusEvents>;
+	hovered?: boolean;
 };
 
 const emit = defineEmits<{
@@ -40,6 +50,8 @@ const emit = defineEmits<{
 	move: [id: string, position: XYPosition];
 }>();
 
+const style = useCssModule();
+
 const props = defineProps<Props>();
 
 const nodeTypesStore = useNodeTypesStore();
@@ -63,6 +75,13 @@ const nodeTypeDescription = computed(() => {
 	return nodeTypesStore.getNodeType(props.data.type, props.data.typeVersion);
 });
 
+const classes = computed(() => ({
+	[style.canvasNode]: true,
+	[style.showToolbar]: showToolbar.value,
+	hovered: props.hovered,
+	selected: props.selected,
+}));
+
 /**
  * Event bus
  */
@@ -256,11 +275,7 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-	<div
-		:class="[$style.canvasNode, { [$style.showToolbar]: showToolbar }]"
-		data-test-id="canvas-node"
-		:data-node-type="data.type"
-	>
+	<div :class="classes" data-test-id="canvas-node" :data-node-type="data.type">
 		<template
 			v-for="source in mappedOutputs"
 			:key="`${source.handleId}(${source.index + 1}/${mappedOutputs.length})`"
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts
index 28ccc20379..ae36476792 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts
@@ -1,6 +1,6 @@
 import CanvasNodeRenderer from '@/components/canvas/elements/nodes/CanvasNodeRenderer.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasNodeProvide } from '@/__tests__/data';
+import { createCanvasNodeProvide, createCanvasProvide } from '@/__tests__/data';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { CanvasNodeRenderType } from '@/types';
@@ -17,6 +17,7 @@ describe('CanvasNodeRenderer', () => {
 		const { getByTestId } = renderComponent({
 			global: {
 				provide: {
+					...createCanvasProvide(),
 					...createCanvasNodeProvide(),
 				},
 			},
@@ -29,6 +30,7 @@ describe('CanvasNodeRenderer', () => {
 		const { getByTestId } = renderComponent({
 			global: {
 				provide: {
+					...createCanvasProvide(),
 					...createCanvasNodeProvide({
 						data: {
 							render: {
@@ -48,6 +50,7 @@ describe('CanvasNodeRenderer', () => {
 		const { getByTestId } = renderComponent({
 			global: {
 				provide: {
+					...createCanvasProvide(),
 					...createCanvasNodeProvide({
 						data: {
 							render: {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
index 422168c2ab..256720c879 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
@@ -1,12 +1,18 @@
 import CanvasNodeDefault from '@/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { NodeConnectionType } from 'n8n-workflow';
-import { createCanvasNodeProvide } from '@/__tests__/data';
+import { createCanvasNodeProvide, createCanvasProvide } from '@/__tests__/data';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
 
-const renderComponent = createComponentRenderer(CanvasNodeDefault);
+const renderComponent = createComponentRenderer(CanvasNodeDefault, {
+	global: {
+		provide: {
+			...createCanvasProvide(),
+		},
+	},
+});
 
 beforeEach(() => {
 	const pinia = createTestingPinia();
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 967a80e6b9..70a9005adc 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
@@ -1,13 +1,11 @@
 <script lang="ts" setup>
-import { computed, useCssModule } from 'vue';
+import { computed, ref, useCssModule, watch } from 'vue';
 import { useNodeConnections } from '@/composables/useNodeConnections';
 import { useI18n } from '@/composables/useI18n';
-import CanvasNodeDisabledStrikeThrough from './parts/CanvasNodeDisabledStrikeThrough.vue';
-import CanvasNodeStatusIcons from '@/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue';
 import { useCanvasNode } from '@/composables/useCanvasNode';
 import { NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS } from '@/constants';
-import { N8nTooltip } from 'n8n-design-system';
 import type { CanvasNodeDefaultRender } from '@/types';
+import { useCanvas } from '@/composables/useCanvas';
 
 const $style = useCssModule();
 const i18n = useI18n();
@@ -16,6 +14,7 @@ const emit = defineEmits<{
 	'open:contextmenu': [event: MouseEvent];
 }>();
 
+const { initialized, viewport } = useCanvas();
 const {
 	label,
 	subtitle,
@@ -105,6 +104,21 @@ const isStrikethroughVisible = computed(() => {
 	return isDisabled.value && isSingleMainInputNode && isSingleMainOutputNode;
 });
 
+const showTooltip = ref(false);
+
+watch(initialized, () => {
+	if (initialized.value) {
+		showTooltip.value = true;
+	}
+});
+
+watch(viewport, () => {
+	showTooltip.value = false;
+	setTimeout(() => {
+		showTooltip.value = true;
+	}, 0);
+});
+
 function openContextMenu(event: MouseEvent) {
 	emit('open:contextmenu', event);
 }
@@ -112,15 +126,9 @@ function openContextMenu(event: MouseEvent) {
 
 <template>
 	<div :class="classes" :style="styles" :data-test-id="dataTestId" @contextmenu="openContextMenu">
+		<CanvasNodeTooltip v-if="renderOptions.tooltip" :visible="showTooltip" />
 		<slot />
-		<N8nTooltip v-if="renderOptions.trigger" placement="bottom">
-			<template #content>
-				<span v-n8n-html="i18n.baseText('node.thisIsATriggerNode')" />
-			</template>
-			<div :class="$style.triggerIcon">
-				<FontAwesomeIcon icon="bolt" size="lg" />
-			</div>
-		</N8nTooltip>
+		<CanvasNodeTriggerIcon v-if="renderOptions.trigger" />
 		<CanvasNodeStatusIcons v-if="!isDisabled" :class="$style.statusIcons" />
 		<CanvasNodeDisabledStrikeThrough v-if="isStrikethroughVisible" />
 		<div :class="$style.description">
@@ -152,6 +160,7 @@ function openContextMenu(event: MouseEvent) {
 	--trigger-node--border-radius: 36px;
 	--canvas-node--status-icons-offset: var(--spacing-2xs);
 
+	position: relative;
 	height: var(--canvas-node--height);
 	width: var(--canvas-node--width);
 	display: flex;
@@ -298,12 +307,4 @@ function openContextMenu(event: MouseEvent) {
 	bottom: var(--canvas-node--status-icons-offset);
 	right: var(--canvas-node--status-icons-offset);
 }
-
-.triggerIcon {
-	position: absolute;
-	right: 100%;
-	margin: auto;
-	color: var(--color-primary);
-	padding: var(--spacing-2xs);
-}
 </style>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
index 0f4170b92e..e9aa65dd55 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
@@ -6,6 +6,7 @@ exports[`CanvasNodeDefault > configurable > should render configurable node corr
   data-test-id="canvas-configurable-node"
   style="--configurable-node--input-count: 0; --canvas-node--main-input-count: 0; --canvas-node--main-output-count: 0;"
 >
+  <!--v-if-->
   
   
   <!--v-if-->
@@ -35,6 +36,7 @@ exports[`CanvasNodeDefault > configuration > should render configurable configur
   data-test-id="canvas-configurable-node"
   style="--configurable-node--input-count: 0; --canvas-node--main-input-count: 0; --canvas-node--main-output-count: 0;"
 >
+  <!--v-if-->
   
   
   <!--v-if-->
@@ -64,6 +66,7 @@ exports[`CanvasNodeDefault > configuration > should render configuration node co
   data-test-id="canvas-configuration-node"
   style="--canvas-node--main-input-count: 0; --canvas-node--main-output-count: 0;"
 >
+  <!--v-if-->
   
   
   <!--v-if-->
@@ -93,6 +96,7 @@ exports[`CanvasNodeDefault > should render node correctly 1`] = `
   data-test-id="canvas-default-node"
   style="--canvas-node--main-input-count: 0; --canvas-node--main-output-count: 0;"
 >
+  <!--v-if-->
   
   
   <!--v-if-->
@@ -122,6 +126,7 @@ exports[`CanvasNodeDefault > trigger > should render trigger node correctly 1`]
   data-test-id="canvas-trigger-node"
   style="--canvas-node--main-input-count: 0; --canvas-node--main-output-count: 0;"
 >
+  <!--v-if-->
   
   
   
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
new file mode 100644
index 0000000000..65c251439b
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
@@ -0,0 +1,54 @@
+import CanvasNodeTooltip from './CanvasNodeTooltip.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import type { CanvasNodeDefaultRender } from '@/types';
+import { createCanvasNodeProvide } from '@/__tests__/data';
+import { waitFor } from '@testing-library/vue';
+
+const renderComponent = createComponentRenderer(CanvasNodeTooltip);
+
+describe('CanvasNodeTooltip', () => {
+	describe('rendering', () => {
+		it('should render tooltip when tooltip option is provided', async () => {
+			const { container, getByText } = renderComponent({
+				props: {
+					visible: true,
+				},
+				global: {
+					provide: createCanvasNodeProvide({
+						data: {
+							render: {
+								options: {
+									tooltip: 'Test tooltip text',
+								},
+							} as CanvasNodeDefaultRender,
+						},
+					}),
+				},
+			});
+
+			expect(getByText('Test tooltip text')).toBeInTheDocument();
+			await waitFor(() => expect(container.querySelector('.el-popper')).toBeVisible());
+		});
+
+		it('should not render tooltip when tooltip option is not provided', () => {
+			const { container } = renderComponent({
+				props: {
+					visible: false,
+				},
+				global: {
+					provide: createCanvasNodeProvide({
+						data: {
+							render: {
+								options: {
+									tooltip: 'Test tooltip text',
+								},
+							} as CanvasNodeDefaultRender,
+						},
+					}),
+				},
+			});
+
+			expect(container.querySelector('.el-popper')).not.toBeVisible();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
new file mode 100644
index 0000000000..876a1d4509
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
@@ -0,0 +1,42 @@
+<script lang="ts" setup>
+import { useCanvasNode } from '@/composables/useCanvasNode';
+import { computed } from 'vue';
+import type { CanvasNodeDefaultRender } from '@/types';
+
+defineProps<{
+	visible: boolean;
+}>();
+
+const { render } = useCanvasNode();
+
+const renderOptions = computed(() => render.value.options as CanvasNodeDefaultRender['options']);
+</script>
+
+<template>
+	<N8nTooltip
+		placement="top"
+		:show-after="500"
+		:visible="true"
+		:teleported="false"
+		:popper-class="$style.popper"
+	>
+		<template #content>
+			{{ renderOptions.tooltip }}
+		</template>
+		<div :class="$style.tooltipTrigger" />
+	</N8nTooltip>
+</template>
+
+<style lang="scss" module>
+.tooltipTrigger {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 1px;
+}
+
+.popper {
+	white-space: nowrap;
+}
+</style>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.test.ts
new file mode 100644
index 0000000000..2fadcc0aee
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.test.ts
@@ -0,0 +1,35 @@
+import CanvasNodeTriggerIcon from './CanvasNodeTriggerIcon.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+
+vi.mock('@/composables/useI18n', () => ({
+	useI18n: vi.fn(() => ({
+		baseText: vi.fn().mockReturnValue('This is a trigger node'),
+	})),
+}));
+
+const renderComponent = createComponentRenderer(CanvasNodeTriggerIcon, {
+	global: {
+		stubs: {
+			FontAwesomeIcon: true,
+		},
+	},
+});
+
+describe('CanvasNodeTriggerIcon', () => {
+	it('should render trigger icon with tooltip', () => {
+		const { container } = renderComponent();
+
+		expect(container.querySelector('.triggerIcon')).toBeInTheDocument();
+
+		const icon = container.querySelector('font-awesome-icon-stub');
+		expect(icon).toBeInTheDocument();
+		expect(icon?.getAttribute('icon')).toBe('bolt');
+		expect(icon?.getAttribute('size')).toBe('lg');
+	});
+
+	it('should render tooltip with correct content', () => {
+		const { getByText } = renderComponent();
+
+		expect(getByText('This is a trigger node')).toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.vue
new file mode 100644
index 0000000000..e37f384dba
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.vue
@@ -0,0 +1,26 @@
+<script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
+
+const i18n = useI18n();
+</script>
+
+<template>
+	<N8nTooltip placement="bottom">
+		<template #content>
+			<span v-n8n-html="i18n.baseText('node.thisIsATriggerNode')" />
+		</template>
+		<div :class="$style.triggerIcon">
+			<FontAwesomeIcon icon="bolt" size="lg" />
+		</div>
+	</N8nTooltip>
+</template>
+
+<style lang="scss" module>
+.triggerIcon {
+	position: absolute;
+	right: 100%;
+	margin: auto;
+	color: var(--color-primary);
+	padding: var(--spacing-2xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
new file mode 100644
index 0000000000..7e7c45b8d4
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
@@ -0,0 +1,73 @@
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import ConcurrentExecutionsHeader from '@/components/executions/ConcurrentExecutionsHeader.vue';
+
+vi.mock('vue-router', () => {
+	return {
+		useRouter: vi.fn(),
+		useRoute: vi.fn(),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+const renderComponent = createComponentRenderer(ConcurrentExecutionsHeader, {
+	pinia: createTestingPinia(),
+});
+
+describe('ConcurrentExecutionsHeader', () => {
+	it('should not throw error when rendered', async () => {
+		expect(() =>
+			renderComponent({
+				props: {
+					runningExecutionsCount: 0,
+					concurrencyCap: 0,
+				},
+			}),
+		).not.toThrow();
+	});
+
+	test.each([
+		[0, 5, 'No active executions'],
+		[2, 5, '2/5 active executions'],
+	])(
+		'shows the correct text when there are %i running executions of %i',
+		async (runningExecutionsCount, concurrencyCap, text) => {
+			const { getByText } = renderComponent({
+				props: {
+					runningExecutionsCount,
+					concurrencyCap,
+				},
+			});
+
+			expect(getByText(text)).toBeVisible();
+		},
+	);
+
+	it('should show tooltip on hover and call "goToUpgrade" on click', async () => {
+		const windowOpenSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
+
+		const { container, getByText, getByRole, queryByRole } = renderComponent({
+			props: {
+				runningExecutionsCount: 2,
+				concurrencyCap: 5,
+			},
+		});
+
+		const tooltipTrigger = container.querySelector('svg') as SVGSVGElement;
+
+		expect(tooltipTrigger).toBeVisible();
+		expect(queryByRole('tooltip')).not.toBeInTheDocument();
+
+		await userEvent.hover(tooltipTrigger);
+
+		expect(getByRole('tooltip')).toBeVisible();
+		expect(getByText('Upgrade now')).toBeVisible();
+
+		await userEvent.click(getByText('Upgrade now'));
+
+		expect(windowOpenSpy).toHaveBeenCalled();
+	});
+});
diff --git a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
new file mode 100644
index 0000000000..9ff4600546
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
@@ -0,0 +1,65 @@
+<script lang="ts" setup>
+import { computed, defineProps } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+
+const props = defineProps<{
+	runningExecutionsCount: number;
+	concurrencyCap: number;
+}>();
+
+const i18n = useI18n();
+const pageRedirectionHelper = usePageRedirectionHelper();
+
+const tooltipText = computed(() =>
+	i18n.baseText('executionsList.activeExecutions.tooltip', {
+		interpolate: {
+			running: props.runningExecutionsCount,
+			cap: props.concurrencyCap,
+		},
+	}),
+);
+
+const headerText = computed(() => {
+	if (props.runningExecutionsCount === 0) {
+		return i18n.baseText('executionsList.activeExecutions.none');
+	}
+	return i18n.baseText('executionsList.activeExecutions.header', {
+		interpolate: {
+			running: props.runningExecutionsCount,
+			cap: props.concurrencyCap,
+		},
+	});
+});
+
+const goToUpgrade = () => {
+	void pageRedirectionHelper.goToUpgrade('concurrency', 'upgrade-concurrency');
+};
+</script>
+
+<template>
+	<div data-test-id="concurrent-executions-header">
+		<n8n-tooltip>
+			<template #content>
+				<div :class="$style.tooltip">
+					{{ tooltipText }}
+					<n8n-link bold size="small" :class="$style.upgrade" @click="goToUpgrade">
+						{{ i18n.baseText('generic.upgradeNow') }}
+					</n8n-link>
+				</div>
+			</template>
+			<font-awesome-icon icon="info-circle" class="mr-2xs" />
+		</n8n-tooltip>
+		<n8n-text>{{ headerText }}</n8n-text>
+	</div>
+</template>
+
+<style module scoped>
+.tooltip {
+	display: flex;
+	flex-direction: column;
+}
+.upgrade {
+	margin-top: var(--spacing-xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
index f1aa96ebaa..cefaee033a 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
@@ -6,9 +6,16 @@ import { faker } from '@faker-js/faker';
 import { STORES, VIEWS } from '@/constants';
 import ExecutionsList from '@/components/executions/global/GlobalExecutionsList.vue';
 import { randomInt, type ExecutionSummary } from 'n8n-workflow';
-import { retry, SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
+import type { MockedStore } from '@/__tests__/utils';
+import {
+	mockedStore,
+	retry,
+	SETTINGS_STORE_DEFAULT_STATE,
+	waitAllPromises,
+} from '@/__tests__/utils';
 import { createComponentRenderer } from '@/__tests__/render';
 import { waitFor } from '@testing-library/vue';
+import { useSettingsStore } from '@/stores/settings.store';
 
 vi.mock('vue-router', () => ({
 	useRoute: vi.fn().mockReturnValue({
@@ -18,7 +25,7 @@ vi.mock('vue-router', () => ({
 	RouterLink: vi.fn(),
 }));
 
-let pinia: ReturnType<typeof createTestingPinia>;
+let settingsStore: MockedStore<typeof useSettingsStore>;
 
 const generateUndefinedNullOrString = () => {
 	switch (randomInt(4)) {
@@ -58,6 +65,20 @@ const generateExecutionsData = () =>
 	}));
 
 const renderComponent = createComponentRenderer(ExecutionsList, {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.EXECUTIONS]: {
+				executions: [],
+			},
+			[STORES.SETTINGS]: {
+				settings: merge(SETTINGS_STORE_DEFAULT_STATE.settings, {
+					enterprise: {
+						advancedExecutionFilters: true,
+					},
+				}),
+			},
+		},
+	}),
 	props: {
 		autoRefreshEnabled: false,
 	},
@@ -80,21 +101,7 @@ describe('GlobalExecutionsList', () => {
 
 	beforeEach(() => {
 		executionsData = generateExecutionsData();
-
-		pinia = createTestingPinia({
-			initialState: {
-				[STORES.EXECUTIONS]: {
-					executions: [],
-				},
-				[STORES.SETTINGS]: {
-					settings: merge(SETTINGS_STORE_DEFAULT_STATE.settings, {
-						enterprise: {
-							advancedExecutionFilters: true,
-						},
-					}),
-				},
-			},
-		});
+		settingsStore = mockedStore(useSettingsStore);
 	});
 
 	it('should render empty list', async () => {
@@ -105,7 +112,6 @@ describe('GlobalExecutionsList', () => {
 				total: 0,
 				estimated: false,
 			},
-			pinia,
 		});
 		await waitAllPromises();
 
@@ -128,7 +134,6 @@ describe('GlobalExecutionsList', () => {
 					filters: {},
 					estimated: false,
 				},
-				pinia,
 			});
 			await waitAllPromises();
 
@@ -194,11 +199,22 @@ describe('GlobalExecutionsList', () => {
 				filters: {},
 				estimated: false,
 			},
-			pinia,
 		});
 		await waitAllPromises();
 
 		expect(queryAllByText(/Retry of/).length).toBe(retryOf.length);
 		expect(queryAllByText(/Success retry/).length).toBe(retrySuccessId.length);
 	});
+
+	it('should render concurrent executions header if the feature is enabled', async () => {
+		settingsStore.concurrency = 5;
+		const { getByTestId } = renderComponent({
+			props: {
+				executions: executionsData[0].results,
+				filters: {},
+			},
+		});
+
+		expect(getByTestId('concurrent-executions-header')).toBeVisible();
+	});
 });
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
index 0a4dbecba3..38aeddda80 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
@@ -15,6 +15,7 @@ import type { PermissionsRecord } from '@/permissions';
 import { getResourcePermissions } from '@/permissions';
 import { useSettingsStore } from '@/stores/settings.store';
 import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
+import ConcurrentExecutionsHeader from '@/components/executions/ConcurrentExecutionsHeader.vue';
 
 const props = withDefaults(
 	defineProps<{
@@ -70,6 +71,10 @@ const isAnnotationEnabled = computed(
 	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
 );
 
+const runningExecutionsCount = computed(() => {
+	return props.executions.filter((execution) => execution.status === 'running').length;
+});
+
 watch(
 	() => props.executions,
 	() => {
@@ -320,6 +325,12 @@ async function onAutoRefreshToggle(value: boolean) {
 		<div :class="$style.execList">
 			<div :class="$style.execListHeader">
 				<div :class="$style.execListHeaderControls">
+					<ConcurrentExecutionsHeader
+						v-if="settingsStore.isConcurrencyEnabled"
+						class="mr-xl"
+						:running-executions-count="runningExecutionsCount"
+						:concurrency-cap="settingsStore.concurrency"
+					/>
 					<N8nLoading v-if="!isMounted" :class="$style.filterLoader" variant="custom" />
 					<ElCheckbox
 						v-else
@@ -388,6 +399,7 @@ async function onAutoRefreshToggle(value: boolean) {
 						:workflow-name="getExecutionWorkflowName(execution)"
 						:workflow-permissions="getExecutionWorkflowPermissions(execution)"
 						:selected="selectedItems[execution.id] || allExistingSelected"
+						:concurrency-cap="settingsStore.concurrency"
 						data-test-id="global-execution-list-item"
 						@stop="stopExecution"
 						@delete="deleteExecution"
@@ -459,8 +471,8 @@ async function onAutoRefreshToggle(value: boolean) {
 	position: relative;
 	height: 100%;
 	width: 100%;
-	max-width: 1280px;
 	padding: var(--spacing-l) var(--spacing-2xl) 0;
+	max-width: var(--content-container-width);
 }
 
 .execList {
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
index 6da106d818..1fbbfd542a 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
@@ -25,6 +25,7 @@ const props = withDefaults(
 		selected?: boolean;
 		workflowName?: string;
 		workflowPermissions: PermissionsRecord['workflow'];
+		concurrencyCap: number;
 	}>(),
 	{
 		selected: false,
@@ -42,6 +43,10 @@ const isRunning = computed(() => {
 	return props.execution.status === 'running';
 });
 
+const isQueued = computed(() => {
+	return props.execution.status === 'new';
+});
+
 const isWaitTillIndefinite = computed(() => {
 	if (!props.execution.waitTill) {
 		return false;
@@ -80,6 +85,12 @@ const formattedStoppedAtDate = computed(() => {
 });
 
 const statusTooltipText = computed(() => {
+	if (isQueued.value) {
+		return i18n.baseText('executionsList.statusTooltipText.waitingForConcurrencyCapacity', {
+			interpolate: { concurrencyCap: props.concurrencyCap },
+		});
+	}
+
 	if (props.execution.status === 'waiting' && isWaitTillIndefinite.value) {
 		return i18n.baseText('executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely');
 	}
@@ -178,7 +189,7 @@ async function handleActionItemClick(commandData: Command) {
 					<FontAwesomeIcon icon="spinner" spin />
 				</span>
 				<i18n-t
-					v-if="!isWaitTillIndefinite"
+					v-if="!isWaitTillIndefinite && !isQueued"
 					data-test-id="execution-status"
 					tag="span"
 					:keypath="statusTextTranslationPath"
@@ -340,7 +351,7 @@ async function handleActionItemClick(commandData: Command) {
 	}
 
 	&.new td:first-child::before {
-		background: var(--execution-card-border-new);
+		background: var(--execution-card-border-waiting);
 	}
 
 	&.running td:first-child::before {
@@ -390,8 +401,8 @@ async function handleActionItemClick(commandData: Command) {
 		font-weight: var(--font-weight-normal);
 	}
 
-	.new {
-		color: var(--color-text-dark);
+	.new & {
+		color: var(--execution-card-text-waiting);
 	}
 
 	.running & {
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.test.ts b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.test.ts
new file mode 100644
index 0000000000..1ba0913b6c
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.test.ts
@@ -0,0 +1,72 @@
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import type { MockedStore } from '@/__tests__/utils';
+import WorkflowExecutionsSidebar from '@/components/executions/workflow/WorkflowExecutionsSidebar.vue';
+import { useSettingsStore } from '@/stores/settings.store';
+import { mockedStore, SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { STORES } from '@/constants';
+import { merge } from 'lodash-es';
+import { expect, it } from 'vitest';
+
+vi.mock('vue-router', () => {
+	const location = {};
+	return {
+		useRouter: vi.fn(),
+		useRoute: () => ({
+			location,
+		}),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+const renderComponent = createComponentRenderer(WorkflowExecutionsSidebar, {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.EXECUTIONS]: {
+				executions: [],
+			},
+			[STORES.SETTINGS]: {
+				settings: merge(SETTINGS_STORE_DEFAULT_STATE.settings, {
+					enterprise: {
+						advancedExecutionFilters: true,
+					},
+				}),
+			},
+		},
+	}),
+});
+
+let settingsStore: MockedStore<typeof useSettingsStore>;
+
+describe('WorkflowExecutionsSidebar', () => {
+	beforeEach(() => {
+		settingsStore = mockedStore(useSettingsStore);
+	});
+
+	it('should not throw error when opened', async () => {
+		expect(() =>
+			renderComponent({
+				props: {
+					loading: false,
+					loadingMore: false,
+					executions: [],
+				},
+			}),
+		).not.toThrow();
+	});
+
+	it('should render concurrent executions header if the feature is enabled', async () => {
+		settingsStore.concurrency = 5;
+		const { getByTestId } = renderComponent({
+			props: {
+				loading: false,
+				loadingMore: false,
+				executions: [],
+			},
+		});
+
+		expect(getByTestId('concurrent-executions-header')).toBeVisible();
+	});
+});
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
index 6dc874d9b9..443a3d0f5d 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
@@ -13,6 +13,8 @@ import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
 import { isComponentPublicInstance } from '@/utils/typeGuards';
 import { getResourcePermissions } from '@/permissions';
 import { useI18n } from '@/composables/useI18n';
+import { useSettingsStore } from '@/stores/settings.store';
+import ConcurrentExecutionsHeader from '@/components/executions/ConcurrentExecutionsHeader.vue';
 
 type AutoScrollDeps = { activeExecutionSet: boolean; cardsMounted: boolean; scroll: boolean };
 
@@ -36,6 +38,7 @@ const router = useRouter();
 const i18n = useI18n();
 
 const executionsStore = useExecutionsStore();
+const settingsStore = useSettingsStore();
 
 const mountedItems = ref<string[]>([]);
 const autoScrollDeps = ref<AutoScrollDeps>({
@@ -49,6 +52,10 @@ const executionListRef = ref<HTMLElement | null>(null);
 
 const workflowPermissions = computed(() => getResourcePermissions(props.workflow?.scopes).workflow);
 
+const runningExecutionsCount = computed(() => {
+	return props.executions.filter((execution) => execution.status === 'running').length;
+});
+
 watch(
 	() => route,
 	(to: RouteLocationNormalizedLoaded, from: RouteLocationNormalizedLoaded) => {
@@ -174,6 +181,12 @@ function scrollToActiveCard(): void {
 			<n8n-heading tag="h2" size="medium" color="text-dark">
 				{{ i18n.baseText('generic.executions') }}
 			</n8n-heading>
+
+			<ConcurrentExecutionsHeader
+				v-if="settingsStore.isConcurrencyEnabled"
+				:running-executions-count="runningExecutionsCount"
+				:concurrency-cap="settingsStore.concurrency"
+			/>
 		</div>
 		<div :class="$style.controls">
 			<el-checkbox
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayout.vue b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
index 3500700373..419a41663f 100644
--- a/packages/editor-ui/src/components/layouts/PageViewLayout.vue
+++ b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
@@ -13,7 +13,7 @@
 	flex-direction: column;
 	height: 100%;
 	width: 100%;
-	max-width: 1280px;
+	max-width: var(--content-container-width);
 	box-sizing: border-box;
 	align-content: start;
 	padding: var(--spacing-l) var(--spacing-2xl) 0;
diff --git a/packages/editor-ui/src/composables/useCanvas.ts b/packages/editor-ui/src/composables/useCanvas.ts
index 57031a233b..dfa8f63ad4 100644
--- a/packages/editor-ui/src/composables/useCanvas.ts
+++ b/packages/editor-ui/src/composables/useCanvas.ts
@@ -1,14 +1,6 @@
-import { computed, inject } from 'vue';
 import { CanvasKey } from '@/constants';
+import { injectStrict } from '@/utils/injectStrict';
 
 export function useCanvas() {
-	const canvas = inject(CanvasKey);
-
-	const connectingHandle = computed(() => canvas?.connectingHandle.value);
-	const isExecuting = computed(() => canvas?.isExecuting.value);
-
-	return {
-		isExecuting,
-		connectingHandle,
-	};
+	return injectStrict(CanvasKey);
 }
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.ts b/packages/editor-ui/src/composables/useCanvasMapping.ts
index 9858a2b930..036a2a2ad1 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.ts
@@ -33,6 +33,7 @@ import type {
 	ExecutionSummary,
 	IConnections,
 	INodeExecutionData,
+	INodeTypeDescription,
 	ITaskData,
 	Workflow,
 } from 'n8n-workflow';
@@ -48,6 +49,7 @@ import {
 import { sanitizeHtml } from '@/utils/htmlUtils';
 import { MarkerType } from '@vue-flow/core';
 import { useNodeHelpers } from './useNodeHelpers';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 
 export function useCanvasMapping({
 	nodes,
@@ -86,7 +88,7 @@ export function useCanvasMapping({
 		return {
 			type: CanvasNodeRenderType.Default,
 			options: {
-				trigger: nodeTypesStore.isTriggerNode(node.type),
+				trigger: isTriggerNodeById.value[node.id],
 				configuration: nodeTypesStore.isConfigNode(workflowObject.value, node, node.type),
 				configurable: nodeTypesStore.isConfigurableNode(workflowObject.value, node, node.type),
 				inputs: {
@@ -95,6 +97,7 @@ export function useCanvasMapping({
 				outputs: {
 					labelSize: nodeOutputLabelSizeById.value[node.id],
 				},
+				tooltip: nodeTooltipById.value[node.id],
 			},
 		};
 	}
@@ -117,10 +120,34 @@ export function useCanvasMapping({
 			}, {}) ?? {},
 	);
 
+	const nodeTypeDescriptionByNodeId = computed(() =>
+		nodes.value.reduce<Record<string, INodeTypeDescription | null>>((acc, node) => {
+			acc[node.id] = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+			return acc;
+		}, {}),
+	);
+
+	const isTriggerNodeById = computed(() =>
+		nodes.value.reduce<Record<string, boolean>>((acc, node) => {
+			acc[node.id] = nodeTypesStore.isTriggerNode(node.type);
+			return acc;
+		}, {}),
+	);
+
+	const activeTriggerNodeCount = computed(
+		() =>
+			nodes.value.filter(
+				(node) =>
+					nodeTypeDescriptionByNodeId.value[node.id]?.eventTriggerDescription !== '' &&
+					isTriggerNodeById.value[node.id] &&
+					!node.disabled,
+			).length,
+	);
+
 	const nodeSubtitleById = computed(() => {
 		return nodes.value.reduce<Record<string, string>>((acc, node) => {
 			try {
-				const nodeTypeDescription = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+				const nodeTypeDescription = nodeTypeDescriptionByNodeId.value[node.id];
 				if (!nodeTypeDescription) {
 					return acc;
 				}
@@ -140,7 +167,7 @@ export function useCanvasMapping({
 
 	const nodeInputsById = computed(() =>
 		nodes.value.reduce<Record<string, CanvasConnectionPort[]>>((acc, node) => {
-			const nodeTypeDescription = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+			const nodeTypeDescription = nodeTypeDescriptionByNodeId.value[node.id];
 			const workflowObjectNode = workflowObject.value.getNode(node.name);
 
 			acc[node.id] =
@@ -203,7 +230,7 @@ export function useCanvasMapping({
 
 	const nodeOutputsById = computed(() =>
 		nodes.value.reduce<Record<string, CanvasConnectionPort[]>>((acc, node) => {
-			const nodeTypeDescription = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+			const nodeTypeDescription = nodeTypeDescriptionByNodeId.value[node.id];
 			const workflowObjectNode = workflowObject.value.getNode(node.name);
 
 			acc[node.id] =
@@ -229,6 +256,37 @@ export function useCanvasMapping({
 		}, {}),
 	);
 
+	const nodeTooltipById = computed(() =>
+		nodes.value.reduce<Record<string, string | undefined>>((acc, node) => {
+			const nodeTypeDescription = nodeTypeDescriptionByNodeId.value[node.id];
+			if (nodeTypeDescription && isTriggerNodeById.value[node.id]) {
+				if (
+					activeTriggerNodeCount.value !== 1 ||
+					!workflowsStore.isWorkflowRunning ||
+					!['new', 'unknown', 'waiting'].includes(nodeExecutionStatusById.value[node.id])
+				) {
+					return acc;
+				}
+
+				if ('eventTriggerDescription' in nodeTypeDescription) {
+					const nodeName = i18n.shortNodeType(nodeTypeDescription.name);
+					const { eventTriggerDescription } = nodeTypeDescription;
+					acc[node.id] = i18n
+						.nodeText()
+						.eventTriggerDescription(nodeName, eventTriggerDescription ?? '');
+				} else {
+					acc[node.id] = i18n.baseText('node.waitingForYouToCreateAnEventIn', {
+						interpolate: {
+							nodeType: nodeTypeDescription ? getTriggerNodeServiceName(nodeTypeDescription) : '',
+						},
+					});
+				}
+			}
+
+			return acc;
+		}, {}),
+	);
+
 	const nodeExecutionRunningById = computed(() =>
 		nodes.value.reduce<Record<string, boolean>>((acc, node) => {
 			acc[node.id] = workflowsStore.isNodeExecuting(node.name);
@@ -514,30 +572,40 @@ export function useCanvasMapping({
 	});
 
 	function getConnectionData(connection: CanvasConnection): CanvasConnectionData {
-		const fromNode = nodes.value.find((node) => node.name === connection.data?.fromNodeName);
+		const { type, index } = parseCanvasConnectionHandleString(connection.sourceHandle);
+		const runDataTotal =
+			nodeExecutionRunDataOutputMapById.value[connection.source]?.[type]?.[index]?.total ?? 0;
 
 		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 (
-				nodePinnedDataById.value[fromNode.id] &&
-				nodeExecutionRunDataById.value[fromNode.id]
-			) {
-				status = 'pinned';
-			} else if (nodeHasIssuesById.value[fromNode.id]) {
-				status = 'error';
-			} else if (runDataTotal > 0) {
-				status = 'success';
-			}
+		if (nodeExecutionRunningById.value[connection.source]) {
+			status = 'running';
+		} else if (
+			nodePinnedDataById.value[connection.source] &&
+			nodeExecutionRunDataById.value[connection.source]
+		) {
+			status = 'pinned';
+		} else if (nodeHasIssuesById.value[connection.source]) {
+			status = 'error';
+		} else if (runDataTotal > 0) {
+			status = 'success';
 		}
 
+		const maxConnections = [
+			...nodeInputsById.value[connection.source],
+			...nodeInputsById.value[connection.target],
+		]
+			.filter((port) => port.type === type)
+			.reduce<number | undefined>((acc, port) => {
+				if (port.maxConnections === undefined) {
+					return acc;
+				}
+
+				return Math.min(acc ?? Infinity, port.maxConnections);
+			}, undefined);
+
 		return {
 			...(connection.data as CanvasConnectionData),
+			...(maxConnections ? { maxConnections } : {}),
 			status,
 		};
 	}
diff --git a/packages/editor-ui/src/composables/useCanvasNode.ts b/packages/editor-ui/src/composables/useCanvasNode.ts
index 6b051992fb..878ecc4d0f 100644
--- a/packages/editor-ui/src/composables/useCanvasNode.ts
+++ b/packages/editor-ui/src/composables/useCanvasNode.ts
@@ -59,7 +59,7 @@ export function useCanvasNode() {
 	const executionStatus = computed(() => data.value.execution.status);
 	const executionWaiting = computed(() => data.value.execution.waiting);
 	const executionRunning = computed(() => data.value.execution.running);
-	const executionRunningThrottled = refThrottled(executionRunning, 300);
+	const executionRunningThrottled = refThrottled(executionRunning, 50);
 
 	const runDataOutputMap = computed(() => data.value.runData.outputMap);
 	const runDataIterations = computed(() => data.value.runData.iterations);
diff --git a/packages/editor-ui/src/composables/useCanvasNodeHandle.ts b/packages/editor-ui/src/composables/useCanvasNodeHandle.ts
index 596fbd45d6..2b4df1bf3a 100644
--- a/packages/editor-ui/src/composables/useCanvasNodeHandle.ts
+++ b/packages/editor-ui/src/composables/useCanvasNodeHandle.ts
@@ -16,6 +16,7 @@ export function useCanvasNodeHandle() {
 	const isConnecting = computed(() => handle?.isConnecting.value ?? false);
 	const isReadOnly = computed(() => handle?.isReadOnly.value);
 	const isRequired = computed(() => handle?.isRequired.value);
+	const maxConnections = computed(() => handle?.maxConnections.value);
 	const type = computed(() => handle?.type.value ?? NodeConnectionType.Main);
 	const mode = computed(() => handle?.mode.value ?? CanvasConnectionMode.Input);
 	const index = computed(() => handle?.index.value ?? 0);
@@ -27,6 +28,7 @@ export function useCanvasNodeHandle() {
 		isConnecting,
 		isReadOnly,
 		isRequired,
+		maxConnections,
 		type,
 		mode,
 		index,
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.test.ts b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
index c64230aa82..6776dda3cd 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.test.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
@@ -5,12 +5,13 @@ import type {
 	IWebhookDescription,
 	Workflow,
 	INodeConnections,
+	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
 import type { CanvasConnection, CanvasNode } from '@/types';
 import { CanvasConnectionMode } from '@/types';
-import type { ICredentialsResponse, INodeUi, IWorkflowDb } from '@/Interface';
+import type { ICredentialsResponse, IExecutionResponse, INodeUi, IWorkflowDb } from '@/Interface';
 import { RemoveNodeCommand } from '@/models/history';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useUIStore } from '@/stores/ui.store';
@@ -2174,6 +2175,67 @@ describe('useCanvasOperations', () => {
 			});
 		});
 	});
+
+	describe('openExecution', () => {
+		it('should initialize workspace and set execution data when execution is found', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const uiStore = mockedStore(useUIStore);
+			const { openExecution } = useCanvasOperations({ router });
+
+			const executionId = '123';
+			const executionData: IExecutionResponse = {
+				id: executionId,
+				finished: true,
+				status: 'success',
+				startedAt: new Date(),
+				createdAt: new Date(),
+				workflowData: createTestWorkflow(),
+				mode: 'manual' as WorkflowExecuteMode,
+			};
+
+			workflowsStore.getExecution.mockResolvedValue(executionData);
+
+			const result = await openExecution(executionId);
+
+			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalledWith(executionData);
+			expect(uiStore.stateIsDirty).toBe(false);
+			expect(result).toEqual(executionData);
+		});
+
+		it('should throw error when execution data is undefined', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const executionId = '123';
+			const { openExecution } = useCanvasOperations({ router });
+
+			workflowsStore.getExecution.mockResolvedValue(undefined);
+
+			await expect(openExecution(executionId)).rejects.toThrow(
+				`Execution with id "${executionId}" could not be found!`,
+			);
+		});
+
+		it('should clear workflow pin data if execution mode is not manual', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const { openExecution } = useCanvasOperations({ router });
+
+			const executionId = '123';
+			const executionData: IExecutionResponse = {
+				id: executionId,
+				finished: true,
+				status: 'success',
+				startedAt: new Date(),
+				createdAt: new Date(),
+				workflowData: createTestWorkflow(),
+				mode: 'trigger' as WorkflowExecuteMode,
+			};
+
+			workflowsStore.getExecution.mockResolvedValue(executionData);
+
+			await openExecution(executionId);
+
+			expect(workflowsStore.setWorkflowPinData).toHaveBeenCalledWith({});
+		});
+	});
 });
 
 function buildImportNodes() {
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/editor-ui/src/composables/useCanvasOperations.ts
index e4400ea665..b8857ebd45 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.ts
@@ -5,6 +5,7 @@
 
 import type {
 	AddedNodesAndConnections,
+	IExecutionResponse,
 	INodeUi,
 	ITag,
 	IUsedCredential,
@@ -90,7 +91,6 @@ import type {
 	Workflow,
 } from 'n8n-workflow';
 import { deepCopy, NodeConnectionType, NodeHelpers, TelemetryHelpers } from 'n8n-workflow';
-import { v4 as uuid } from 'uuid';
 import { computed, nextTick, ref } from 'vue';
 import type { useRouter } from 'vue-router';
 import { useClipboard } from '@/composables/useClipboard';
@@ -759,7 +759,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		node: AddNodeDataWithTypeVersion,
 		nodeTypeDescription: INodeTypeDescription,
 	) {
-		const id = node.id ?? uuid();
+		const id = node.id ?? nodeHelpers.assignNodeId(node as INodeUi);
 		const name = node.name ?? (nodeTypeDescription.defaults.name as string);
 		const type = nodeTypeDescription.name;
 		const typeVersion = node.typeVersion;
@@ -1027,7 +1027,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 	function resolveNodeWebhook(node: INodeUi, nodeTypeDescription: INodeTypeDescription) {
 		if (nodeTypeDescription.webhooks?.length && !node.webhookId) {
-			node.webhookId = uuid();
+			nodeHelpers.assignWebhookId(node);
 		}
 
 		// if it's a webhook and the path is empty set the UUID as the default path
@@ -1613,7 +1613,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 							(n) => n.webhookId === node.webhookId,
 						);
 						if (isDuplicate) {
-							node.webhookId = uuid();
+							nodeHelpers.assignWebhookId(node);
 
 							if (node.parameters.path) {
 								node.parameters.path = node.webhookId as string;
@@ -1623,13 +1623,13 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 						}
 					}
 
-					// set all new ids when pasting/importing workflows
+					// Set all new ids when pasting/importing workflows
 					if (node.id) {
-						const newId = uuid();
-						nodeIdMap[newId] = node.id;
-						node.id = newId;
+						const previousId = node.id;
+						const newId = nodeHelpers.assignNodeId(node);
+						nodeIdMap[newId] = previousId;
 					} else {
-						node.id = uuid();
+						nodeHelpers.assignNodeId(node);
 					}
 				});
 			}
@@ -1850,6 +1850,32 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		deleteNodes(ids);
 	}
 
+	async function openExecution(executionId: string) {
+		let data: IExecutionResponse | undefined;
+		try {
+			data = await workflowsStore.getExecution(executionId);
+		} catch (error) {
+			toast.showError(error, i18n.baseText('nodeView.showError.openExecution.title'));
+			return;
+		}
+
+		if (data === undefined) {
+			throw new Error(`Execution with id "${executionId}" could not be found!`);
+		}
+
+		initializeWorkspace(data.workflowData);
+
+		workflowsStore.setWorkflowExecutionData(data);
+
+		if (data.mode !== 'manual') {
+			workflowsStore.setWorkflowPinData({});
+		}
+
+		uiStore.stateIsDirty = false;
+
+		return data;
+	}
+
 	return {
 		lastClickPosition,
 		editableWorkflow,
@@ -1892,5 +1918,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		resetWorkspace,
 		initializeWorkspace,
 		resolveNodeWebhook,
+		openExecution,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useDataSchema.test.ts b/packages/editor-ui/src/composables/useDataSchema.test.ts
index 3c685550c7..212f767675 100644
--- a/packages/editor-ui/src/composables/useDataSchema.test.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.test.ts
@@ -1,5 +1,5 @@
 import jp from 'jsonpath';
-import { useDataSchema } from '@/composables/useDataSchema';
+import { useDataSchema, useFlattenSchema } from '@/composables/useDataSchema';
 import type { IExecutionResponse, INodeUi, Schema } from '@/Interface';
 import { setActivePinia } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
@@ -649,3 +649,39 @@ describe('useDataSchema', () => {
 		);
 	});
 });
+
+describe('useFlattenSchema', () => {
+	it('flattens a schema', () => {
+		const schema: Schema = {
+			path: '',
+			type: 'object',
+			value: [
+				{
+					key: 'obj',
+					path: '.obj',
+					type: 'object',
+					value: [
+						{
+							key: 'foo',
+							path: '.obj.foo',
+							type: 'object',
+							value: [
+								{
+									key: 'nested',
+									path: '.obj.foo.nested',
+									type: 'string',
+									value: 'bar',
+								},
+							],
+						},
+					],
+				},
+			],
+		};
+		expect(
+			useFlattenSchema().flattenSchema({
+				schema,
+			}).length,
+		).toBe(3);
+	});
+});
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
index 8b20ab93fc..8896f8dd7e 100644
--- a/packages/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -1,15 +1,18 @@
+import { ref } from 'vue';
 import type { Optional, Primitives, Schema, INodeUi } from '@/Interface';
 import {
 	type ITaskDataConnections,
 	type IDataObject,
 	type INodeExecutionData,
+	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
 import { merge } from 'lodash-es';
-import { generatePath } from '@/utils/mappingUtils';
+import { generatePath, getMappedExpression } from '@/utils/mappingUtils';
 import { isObj } from '@/utils/typeGuards';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { isPresent } from '@/utils/typesUtils';
+import { isPresent, shorten } from '@/utils/typesUtils';
+import { useI18n } from '@/composables/useI18n';
 
 export function useDataSchema() {
 	function getSchema(
@@ -166,3 +169,208 @@ export function useDataSchema() {
 		filterSchema,
 	};
 }
+
+export type SchemaNode = {
+	node: INodeUi;
+	nodeType: INodeTypeDescription;
+	depth: number;
+	connectedOutputIndexes: number[];
+	itemsCount: number;
+	schema: Schema;
+};
+
+export type RenderItem = {
+	title?: string;
+	path?: string;
+	level?: number;
+	depth?: number;
+	expression?: string;
+	value?: string;
+	id: string;
+	icon: string;
+	collapsable?: boolean;
+	nodeType?: INodeUi['type'];
+	type: 'item';
+};
+
+export type RenderHeader = {
+	id: string;
+	title: string;
+	info?: string;
+	collapsable: boolean;
+	nodeType: INodeTypeDescription;
+	itemCount: number | null;
+	type: 'header';
+};
+
+type Renders = RenderHeader | RenderItem;
+
+const icons = {
+	object: 'cube',
+	array: 'list',
+	['string']: 'font',
+	null: 'font',
+	['number']: 'hashtag',
+	['boolean']: 'check-square',
+	function: 'code',
+	bigint: 'calculator',
+	symbol: 'sun',
+	['undefined']: 'ban',
+} as const;
+
+const getIconBySchemaType = (type: Schema['type']): string => icons[type];
+
+const emptyItem = (): RenderItem => ({
+	id: `empty-${window.crypto.randomUUID()}`,
+	icon: '',
+	value: useI18n().baseText('dataMapping.schemaView.emptyData'),
+	type: 'item',
+});
+
+const isDataEmpty = (schema: Schema) => {
+	// Utilize the generated schema instead of looping over the entire data again
+	// The schema for empty data is { type: 'object', value: [] }
+	const isObjectOrArray = schema.type === 'object';
+	const isEmpty = Array.isArray(schema.value) && schema.value.length === 0;
+
+	return isObjectOrArray && isEmpty;
+};
+
+const prefixTitle = (title: string, prefix?: string) => (prefix ? `${prefix}[${title}]` : title);
+
+export const useFlattenSchema = () => {
+	const closedNodes = ref<Set<string>>(new Set());
+	const headerIds = ref<Set<string>>(new Set());
+	const toggleLeaf = (id: string) => {
+		if (closedNodes.value.has(id)) {
+			closedNodes.value.delete(id);
+		} else {
+			closedNodes.value.add(id);
+		}
+	};
+
+	const toggleNode = (id: string) => {
+		if (closedNodes.value.has(id)) {
+			closedNodes.value = new Set(headerIds.value);
+			closedNodes.value.delete(id);
+		} else {
+			closedNodes.value.add(id);
+		}
+	};
+
+	const flattenSchema = ({
+		schema,
+		node = { name: '', type: '' },
+		depth = 0,
+		prefix = '',
+		level = 0,
+	}: {
+		schema: Schema;
+		node?: { name: string; type: string };
+		depth?: number;
+		prefix?: string;
+		level?: number;
+	}): RenderItem[] => {
+		// only show empty item for the first level
+		if (isDataEmpty(schema) && depth <= 0) {
+			return [emptyItem()];
+		}
+
+		const expression = getMappedExpression({
+			nodeName: node.name,
+			distanceFromActive: depth,
+			path: schema.path,
+		});
+
+		if (Array.isArray(schema.value)) {
+			const items: RenderItem[] = [];
+
+			if (schema.key) {
+				items.push({
+					title: prefixTitle(schema.key, prefix),
+					path: schema.path,
+					expression,
+					depth,
+					level,
+					icon: getIconBySchemaType(schema.type),
+					id: expression,
+					collapsable: true,
+					nodeType: node.type,
+					type: 'item',
+				});
+			}
+
+			if (closedNodes.value.has(expression)) {
+				return items;
+			}
+
+			return items.concat(
+				schema.value
+					.map((item) => {
+						const itemPrefix = schema.type === 'array' ? schema.key : '';
+						return flattenSchema({
+							schema: item,
+							node,
+							depth,
+							prefix: itemPrefix,
+							level: level + 1,
+						});
+					})
+					.flat(),
+			);
+		} else if (schema.key) {
+			return [
+				{
+					title: prefixTitle(schema.key, prefix),
+					path: schema.path,
+					expression,
+					level,
+					depth,
+					value: shorten(schema.value, 600, 0),
+					id: expression,
+					icon: getIconBySchemaType(schema.type),
+					collapsable: false,
+					nodeType: node.type,
+					type: 'item',
+				},
+			];
+		}
+
+		return [];
+	};
+
+	const flattenMultipleSchemas = (
+		nodes: SchemaNode[],
+		additionalInfo: (node: INodeUi) => string,
+	) => {
+		headerIds.value.clear();
+
+		return nodes.reduce<Renders[]>((acc, item) => {
+			acc.push({
+				title: item.node.name,
+				id: item.node.name,
+				collapsable: true,
+				nodeType: item.nodeType,
+				itemCount: item.itemsCount,
+				info: additionalInfo(item.node),
+				type: 'header',
+			});
+
+			headerIds.value.add(item.node.name);
+
+			if (closedNodes.value.has(item.node.name)) {
+				return acc;
+			}
+
+			if (isDataEmpty(item.schema)) {
+				acc.push(emptyItem());
+				return acc;
+			}
+
+			acc.push(...flattenSchema(item));
+			return acc;
+		}, []);
+	};
+
+	return { closedNodes, toggleLeaf, toggleNode, flattenSchema, flattenMultipleSchemas };
+};
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.ts b/packages/editor-ui/src/composables/useExpressionEditor.ts
index a63570d101..0911621be3 100644
--- a/packages/editor-ui/src/composables/useExpressionEditor.ts
+++ b/packages/editor-ui/src/composables/useExpressionEditor.ts
@@ -305,7 +305,11 @@ export const useExpressionEditor = ({
 				result.resolved = workflowHelpers.resolveExpression('=' + resolvable, undefined, opts);
 			}
 		} catch (error) {
-			result.resolved = `[${getExpressionErrorMessage(error)}]`;
+			const hasRunData =
+				!!workflowsStore.workflowExecutionData?.data?.resultData?.runData[
+					ndvStore.activeNode?.name ?? ''
+				];
+			result.resolved = `[${getExpressionErrorMessage(error, hasRunData)}]`;
 			result.error = true;
 			result.fullError = error;
 		}
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts b/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
index d6fa2d8837..0ad17e99b3 100644
--- a/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
+++ b/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
@@ -57,7 +57,7 @@ describe('useGlobalEntityCreation', () => {
 		const projectsStore = mockedStore(useProjectsStore);
 
 		const personalProjectId = 'personal-project';
-		projectsStore.canCreateProjects = false;
+		projectsStore.isTeamProjectFeatureEnabled = false;
 		projectsStore.personalProject = { id: personalProjectId } as Project;
 		const { menu } = useGlobalEntityCreation();
 
@@ -83,7 +83,7 @@ describe('useGlobalEntityCreation', () => {
 		it('should use currentProject', () => {
 			const projectsStore = mockedStore(useProjectsStore);
 
-			projectsStore.canCreateProjects = true;
+			projectsStore.isTeamProjectFeatureEnabled = true;
 			projectsStore.currentProject = { id: currentProjectId } as Project;
 
 			const { menu } = useGlobalEntityCreation(false);
@@ -107,7 +107,7 @@ describe('useGlobalEntityCreation', () => {
 		it('should be disabled in readOnly', () => {
 			const projectsStore = mockedStore(useProjectsStore);
 
-			projectsStore.canCreateProjects = true;
+			projectsStore.isTeamProjectFeatureEnabled = true;
 			projectsStore.currentProject = { id: currentProjectId } as Project;
 
 			const sourceControl = mockedStore(useSourceControlStore);
@@ -131,7 +131,7 @@ describe('useGlobalEntityCreation', () => {
 		it('should be disabled based in scopes', () => {
 			const projectsStore = mockedStore(useProjectsStore);
 
-			projectsStore.canCreateProjects = true;
+			projectsStore.isTeamProjectFeatureEnabled = true;
 			projectsStore.currentProject = { id: currentProjectId, scopes: [] } as unknown as Project;
 
 			const { menu } = useGlobalEntityCreation(false);
@@ -155,7 +155,7 @@ describe('useGlobalEntityCreation', () => {
 			const projectsStore = mockedStore(useProjectsStore);
 
 			const personalProjectId = 'personal-project';
-			projectsStore.canCreateProjects = true;
+			projectsStore.isTeamProjectFeatureEnabled = true;
 			projectsStore.personalProject = { id: personalProjectId } as Project;
 			projectsStore.myProjects = [
 				{ id: '1', name: '1', type: 'team' },
@@ -173,7 +173,7 @@ describe('useGlobalEntityCreation', () => {
 	describe('handleSelect()', () => {
 		it('should only handle create-project', () => {
 			const projectsStore = mockedStore(useProjectsStore);
-			projectsStore.canCreateProjects = true;
+			projectsStore.isTeamProjectFeatureEnabled = true;
 			const { handleSelect } = useGlobalEntityCreation(true);
 			handleSelect('dummy');
 			expect(projectsStore.createProject).not.toHaveBeenCalled();
@@ -182,6 +182,7 @@ describe('useGlobalEntityCreation', () => {
 		it('creates a new project', async () => {
 			const toast = useToast();
 			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.isTeamProjectFeatureEnabled = true;
 			projectsStore.canCreateProjects = true;
 			projectsStore.createProject.mockResolvedValueOnce({ name: 'test', id: '1' } as Project);
 
@@ -198,6 +199,7 @@ describe('useGlobalEntityCreation', () => {
 		it('handles create project error', async () => {
 			const toast = useToast();
 			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.isTeamProjectFeatureEnabled = true;
 			projectsStore.canCreateProjects = true;
 			projectsStore.createProject.mockRejectedValueOnce(new Error('error'));
 
@@ -211,6 +213,7 @@ describe('useGlobalEntityCreation', () => {
 		it('redirects when project limit has been reached', () => {
 			const projectsStore = mockedStore(useProjectsStore);
 			projectsStore.canCreateProjects = false;
+			projectsStore.isTeamProjectFeatureEnabled = true;
 			const redirect = usePageRedirectionHelper();
 
 			const { handleSelect } = useGlobalEntityCreation(true);
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.ts b/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
index cd25b4c71f..a7e448ba8c 100644
--- a/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
+++ b/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
@@ -50,7 +50,7 @@ export const useGlobalEntityCreation = (
 
 	const menu = computed<Item[]>(() => {
 		// Community
-		if (!projectsStore.canCreateProjects) {
+		if (!projectsStore.isTeamProjectFeatureEnabled) {
 			return [
 				{
 					id: 'workflow',
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.test.ts b/packages/editor-ui/src/composables/useNodeHelpers.test.ts
index 732bf51f5e..538a40c5e2 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.test.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.test.ts
@@ -208,4 +208,30 @@ describe('useNodeHelpers()', () => {
 			},
 		);
 	});
+
+	describe('assignNodeId()', () => {
+		it('should assign a unique id to the node', () => {
+			const { assignNodeId } = useNodeHelpers();
+			const node = createTestNode({
+				id: '',
+			});
+
+			assignNodeId(node);
+			expect(node.id).not.toBe('');
+			expect(node.id).toMatch(/\w+(-\w+)+/);
+		});
+	});
+
+	describe('assignWebhookId', () => {
+		it('should assign a unique id to the webhook', () => {
+			const { assignWebhookId } = useNodeHelpers();
+			const webhook = createTestNode({
+				id: '',
+			});
+
+			assignWebhookId(webhook);
+			expect(webhook.webhookId).not.toBe('');
+			expect(webhook.webhookId).toMatch(/\w+(-\w+)+/);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index ff512181e7..95ab27d7ec 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -1,6 +1,5 @@
 import { ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
-import { v4 as uuid } from 'uuid';
 import type { Connection, ConnectionDetachedParams } from '@jsplumb/core';
 import { useHistoryStore } from '@/stores/history.store';
 import {
@@ -1187,7 +1186,7 @@ export function useNodeHelpers() {
 			};
 
 			if (!newNode.id) {
-				newNode.id = uuid();
+				assignNodeId(newNode);
 			}
 
 			nodeType = nodeTypesStore.getNodeType(newNode.type, newNode.typeVersion);
@@ -1257,6 +1256,18 @@ export function useNodeHelpers() {
 		canvasStore.jsPlumbInstance?.setSuspendDrawing(false, true);
 	}
 
+	function assignNodeId(node: INodeUi) {
+		const id = window.crypto.randomUUID();
+		node.id = id;
+		return id;
+	}
+
+	function assignWebhookId(node: INodeUi) {
+		const id = window.crypto.randomUUID();
+		node.webhookId = id;
+		return id;
+	}
+
 	return {
 		hasProxyAuth,
 		isCustomApiCallSelected,
@@ -1292,5 +1303,7 @@ export function useNodeHelpers() {
 		addPinDataConnections,
 		removePinDataConnections,
 		getNodeTaskData,
+		assignNodeId,
+		assignWebhookId,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.test.ts b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.test.ts
new file mode 100644
index 0000000000..e5cfe1cb2d
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.test.ts
@@ -0,0 +1,156 @@
+import { useNodeViewVersionSwitcher } from './useNodeViewVersionSwitcher';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createTestingPinia } from '@pinia/testing';
+import { STORES } from '@/constants';
+import { setActivePinia } from 'pinia';
+import { mockedStore } from '@/__tests__/utils';
+import { useNDVStore } from '@/stores/ndv.store';
+
+vi.mock('@/composables/useTelemetry', () => ({
+	useTelemetry: () => ({
+		track: vi.fn(),
+	}),
+}));
+
+describe('useNodeViewVersionSwitcher', () => {
+	const initialState = {
+		[STORES.WORKFLOWS]: {},
+		[STORES.NDV]: {},
+	};
+
+	beforeEach(() => {
+		vi.clearAllMocks();
+		const pinia = createTestingPinia({ initialState });
+		setActivePinia(pinia);
+	});
+
+	describe('isNewUser', () => {
+		test('should return true when there are no active workflows', () => {
+			const { isNewUser } = useNodeViewVersionSwitcher();
+			expect(isNewUser.value).toBe(true);
+		});
+
+		test('should return false when there are active workflows', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.activeWorkflows = ['1'];
+
+			const { isNewUser } = useNodeViewVersionSwitcher();
+			expect(isNewUser.value).toBe(false);
+		});
+	});
+
+	describe('nodeViewVersion', () => {
+		test('should initialize with default version "2"', () => {
+			const { nodeViewVersion } = useNodeViewVersionSwitcher();
+			expect(nodeViewVersion.value).toBe('2');
+		});
+	});
+
+	describe('isNodeViewDiscoveryTooltipVisible', () => {
+		test('should be visible under correct conditions', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.activeWorkflows = ['1'];
+
+			const ndvStore = mockedStore(useNDVStore);
+			ndvStore.activeNodeName = null;
+
+			const { isNodeViewDiscoveryTooltipVisible } = useNodeViewVersionSwitcher();
+			expect(isNodeViewDiscoveryTooltipVisible.value).toBe(true);
+		});
+
+		test('should not be visible for new users', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			workflowsStore.activeWorkflows = [];
+
+			const { isNodeViewDiscoveryTooltipVisible } = useNodeViewVersionSwitcher();
+			expect(isNodeViewDiscoveryTooltipVisible.value).toBe(false);
+		});
+
+		test('should not be visible when node is selected', () => {
+			const ndvStore = mockedStore(useNDVStore);
+			ndvStore.activeNodeName = 'test-node';
+
+			const { isNodeViewDiscoveryTooltipVisible } = useNodeViewVersionSwitcher();
+			expect(isNodeViewDiscoveryTooltipVisible.value).toBe(false);
+		});
+	});
+
+	describe('switchNodeViewVersion', () => {
+		test('should switch from version 2 to 1 and back', () => {
+			const { nodeViewVersion, switchNodeViewVersion } = useNodeViewVersionSwitcher();
+
+			switchNodeViewVersion();
+
+			expect(nodeViewVersion.value).toBe('1');
+
+			switchNodeViewVersion();
+
+			expect(nodeViewVersion.value).toBe('2');
+		});
+	});
+
+	describe('migrateToNewNodeViewVersion', () => {
+		test('should not migrate if already migrated', () => {
+			const { nodeViewVersion, nodeViewVersionMigrated, migrateToNewNodeViewVersion } =
+				useNodeViewVersionSwitcher();
+			nodeViewVersionMigrated.value = true;
+
+			migrateToNewNodeViewVersion();
+
+			expect(nodeViewVersion.value).toBe('2');
+		});
+
+		test('should not migrate if already on version 2', () => {
+			const { nodeViewVersion, migrateToNewNodeViewVersion } = useNodeViewVersionSwitcher();
+			nodeViewVersion.value = '2';
+
+			migrateToNewNodeViewVersion();
+
+			expect(nodeViewVersion.value).not.toBe('1');
+		});
+
+		test('should migrate to version 2 if not migrated and on version 1', () => {
+			const { nodeViewVersion, nodeViewVersionMigrated, migrateToNewNodeViewVersion } =
+				useNodeViewVersionSwitcher();
+			nodeViewVersion.value = '1';
+			nodeViewVersionMigrated.value = false;
+
+			migrateToNewNodeViewVersion();
+
+			expect(nodeViewVersion.value).toBe('2');
+			expect(nodeViewVersionMigrated.value).toBe(true);
+		});
+	});
+
+	describe('setNodeViewSwitcherDropdownOpened', () => {
+		test('should set discovered when dropdown is closed', () => {
+			const { setNodeViewSwitcherDropdownOpened, nodeViewSwitcherDiscovered } =
+				useNodeViewVersionSwitcher();
+
+			setNodeViewSwitcherDropdownOpened(false);
+
+			expect(nodeViewSwitcherDiscovered.value).toBe(true);
+			nodeViewSwitcherDiscovered.value = false;
+		});
+
+		test('should not set discovered when dropdown is opened', () => {
+			const { setNodeViewSwitcherDropdownOpened, nodeViewSwitcherDiscovered } =
+				useNodeViewVersionSwitcher();
+
+			setNodeViewSwitcherDropdownOpened(true);
+
+			expect(nodeViewSwitcherDiscovered.value).toBe(false);
+		});
+	});
+
+	describe('setNodeViewSwitcherDiscovered', () => {
+		test('should set nodeViewSwitcherDiscovered to true', () => {
+			const { setNodeViewSwitcherDiscovered, nodeViewSwitcherDiscovered } =
+				useNodeViewVersionSwitcher();
+
+			setNodeViewSwitcherDiscovered();
+
+			expect(nodeViewSwitcherDiscovered.value).toBe(true);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts
index c91da5dcc2..ea89f8d533 100644
--- a/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts
+++ b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts
@@ -1,6 +1,5 @@
 import { computed } from 'vue';
-import { useLocalStorage, debouncedRef } from '@vueuse/core';
-import { useSettingsStore } from '@/stores/settings.store';
+import { useLocalStorage } from '@vueuse/core';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -8,16 +7,12 @@ import { useNDVStore } from '@/stores/ndv.store';
 export function useNodeViewVersionSwitcher() {
 	const ndvStore = useNDVStore();
 	const workflowsStore = useWorkflowsStore();
-	const settingsStore = useSettingsStore();
 	const telemetry = useTelemetry();
 
 	const isNewUser = computed(() => workflowsStore.activeWorkflows.length === 0);
-	const isNewUserDebounced = debouncedRef(isNewUser, 3000);
 
-	const nodeViewVersion = useLocalStorage(
-		'NodeView.version',
-		settingsStore.isCanvasV2Enabled ? '2' : '1',
-	);
+	const nodeViewVersion = useLocalStorage('NodeView.version', '2');
+	const nodeViewVersionMigrated = useLocalStorage('NodeView.migrated', false);
 
 	function setNodeViewSwitcherDropdownOpened(visible: boolean) {
 		if (!visible) {
@@ -25,20 +20,21 @@ export function useNodeViewVersionSwitcher() {
 		}
 	}
 
-	const nodeViewSwitcherDiscovered = useLocalStorage('NodeView.switcher.discovered', false);
+	const nodeViewSwitcherDiscovered = useLocalStorage('NodeView.switcher.discovered.beta', false);
 	function setNodeViewSwitcherDiscovered() {
 		nodeViewSwitcherDiscovered.value = true;
 	}
 
 	const isNodeViewDiscoveryTooltipVisible = computed(
 		() =>
+			!isNewUser.value &&
 			!ndvStore.activeNodeName &&
-			nodeViewVersion.value !== '2' &&
-			!(isNewUserDebounced.value || nodeViewSwitcherDiscovered.value),
+			nodeViewVersion.value === '2' &&
+			!nodeViewSwitcherDiscovered.value,
 	);
 
 	function switchNodeViewVersion() {
-		const toVersion = nodeViewVersion.value === '1' ? '2' : '1';
+		const toVersion = nodeViewVersion.value === '2' ? '1' : '2';
 
 		telemetry.track('User switched canvas version', {
 			to_version: toVersion,
@@ -47,12 +43,24 @@ export function useNodeViewVersionSwitcher() {
 		nodeViewVersion.value = toVersion;
 	}
 
+	function migrateToNewNodeViewVersion() {
+		if (nodeViewVersionMigrated.value || nodeViewVersion.value === '2') {
+			return;
+		}
+
+		switchNodeViewVersion();
+		nodeViewVersionMigrated.value = true;
+	}
+
 	return {
+		isNewUser,
 		nodeViewVersion,
+		nodeViewVersionMigrated,
 		nodeViewSwitcherDiscovered,
 		isNodeViewDiscoveryTooltipVisible,
 		setNodeViewSwitcherDropdownOpened,
 		setNodeViewSwitcherDiscovered,
 		switchNodeViewVersion,
+		migrateToNewNodeViewVersion,
 	};
 }
diff --git a/packages/editor-ui/src/composables/usePushConnection.test.ts b/packages/editor-ui/src/composables/usePushConnection.test.ts
index baccb40887..c2901249d6 100644
--- a/packages/editor-ui/src/composables/usePushConnection.test.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.test.ts
@@ -2,8 +2,7 @@ import { stringify } from 'flatted';
 import { useRouter } from 'vue-router';
 import { createPinia, setActivePinia } from 'pinia';
 import type { PushMessage, PushPayload } from '@n8n/api-types';
-import { mock } from 'vitest-mock-extended';
-import type { ITaskData, WorkflowOperationError } from 'n8n-workflow';
+import type { ITaskData, WorkflowOperationError, IRunData } from 'n8n-workflow';
 
 import { usePushConnection } from '@/composables/usePushConnection';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
@@ -140,10 +139,7 @@ describe('usePushConnection()', () => {
 
 		describe('executionFinished', () => {
 			const executionId = '1';
-			const event: PushMessage = {
-				type: 'executionFinished',
-				data: { executionId: '1' },
-			};
+			const workflowId = 'abc';
 
 			beforeEach(() => {
 				workflowsStore.activeExecutionId = executionId;
@@ -151,28 +147,23 @@ describe('usePushConnection()', () => {
 			});
 
 			it('should handle executionFinished event correctly', async () => {
-				const spy = vi.spyOn(workflowsStore, 'fetchExecutionDataById').mockResolvedValue(
-					mock<IExecutionResponse>({
-						id: executionId,
-						data: stringify({
+				const result = await pushConnection.pushMessageReceived({
+					type: 'executionFinished',
+					data: {
+						executionId,
+						workflowId,
+						status: 'success',
+						rawData: stringify({
 							resultData: {
 								runData: {},
 							},
-						}) as unknown as IExecutionResponse['data'],
-						finished: true,
-						mode: 'manual',
-						startedAt: new Date(),
-						stoppedAt: new Date(),
-						status: 'success',
-					}),
-				);
-
-				const result = await pushConnection.pushMessageReceived(event);
+						}),
+					},
+				});
 
 				expect(result).toBeTruthy();
 				expect(workflowsStore.workflowExecutionData).toBeDefined();
-				expect(uiStore.isActionActive['workflowRunning']).toBeTruthy();
-				expect(spy).toHaveBeenCalledWith(executionId);
+				expect(uiStore.isActionActive.workflowRunning).toBeTruthy();
 
 				expect(toast.showMessage).toHaveBeenCalledWith({
 					title: 'Workflow executed successfully',
@@ -181,10 +172,13 @@ describe('usePushConnection()', () => {
 			});
 
 			it('should handle isManualExecutionCancelled correctly', async () => {
-				const spy = vi.spyOn(workflowsStore, 'fetchExecutionDataById').mockResolvedValue(
-					mock<IExecutionResponse>({
-						id: executionId,
-						data: stringify({
+				const result = await pushConnection.pushMessageReceived({
+					type: 'executionFinished',
+					data: {
+						executionId,
+						workflowId,
+						status: 'error',
+						rawData: stringify({
 							startData: {},
 							resultData: {
 								runData: {
@@ -198,14 +192,9 @@ describe('usePushConnection()', () => {
 									node: 'Last Node',
 								} as unknown as WorkflowOperationError,
 							},
-						}) as unknown as IExecutionResponse['data'],
-						mode: 'manual',
-						startedAt: new Date(),
-						status: 'running',
-					}),
-				);
-
-				const result = await pushConnection.pushMessageReceived(event);
+						}),
+					},
+				});
 
 				expect(useToast().showMessage).toHaveBeenCalledWith({
 					message:
@@ -219,7 +208,6 @@ describe('usePushConnection()', () => {
 				expect(result).toBeTruthy();
 				expect(workflowsStore.workflowExecutionData).toBeDefined();
 				expect(uiStore.isActionActive.workflowRunning).toBeTruthy();
-				expect(spy).toHaveBeenCalledWith(executionId);
 			});
 		});
 
@@ -249,5 +237,62 @@ describe('usePushConnection()', () => {
 				expect(pushConnection.retryTimeout).not.toBeNull();
 			});
 		});
+
+		describe('executionStarted', async () => {
+			it("enqueues messages if we don't have the active execution id yet", async () => {
+				uiStore.isActionActive.workflowRunning = true;
+				const event: PushMessage = {
+					type: 'executionStarted',
+					data: {
+						executionId: '1',
+						mode: 'manual',
+						startedAt: new Date(),
+						workflowId: '1',
+						flattedRunData: stringify({}),
+					},
+				};
+
+				expect(pushConnection.retryTimeout.value).toBeNull();
+				expect(pushConnection.pushMessageQueue.value.length).toBe(0);
+
+				const result = await pushConnection.pushMessageReceived(event);
+
+				expect(result).toBe(false);
+				expect(pushConnection.pushMessageQueue.value).toHaveLength(1);
+				expect(pushConnection.pushMessageQueue.value).toContainEqual({
+					message: event,
+					retriesLeft: 5,
+				});
+				expect(pushConnection.retryTimeout).not.toBeNull();
+			});
+
+			it('overwrites the run data in the workflow store', async () => {
+				// ARRANGE
+				uiStore.isActionActive.workflowRunning = true;
+				const oldRunData: IRunData = { foo: [] };
+				workflowsStore.workflowExecutionData = {
+					data: { resultData: { runData: oldRunData } },
+				} as IExecutionResponse;
+				const newRunData: IRunData = { bar: [] };
+				const event: PushMessage = {
+					type: 'executionStarted',
+					data: {
+						executionId: '1',
+						flattedRunData: stringify(newRunData),
+						mode: 'manual',
+						startedAt: new Date(),
+						workflowId: '1',
+					},
+				};
+				workflowsStore.activeExecutionId = event.data.executionId;
+
+				// ACT
+				const result = await pushConnection.pushMessageReceived(event);
+
+				// ASSERT
+				expect(result).toBe(true);
+				expect(workflowsStore.workflowExecutionData.data?.resultData.runData).toEqual(newRunData);
+			});
+		});
 	});
 });
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index 6e9808c36a..ee511958e3 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -35,6 +35,7 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import type { PushMessageQueueItem } from '@/types';
 import { useAssistantStore } from '@/stores/assistant.store';
 import NodeExecutionErrorMessage from '@/components/NodeExecutionErrorMessage.vue';
+import type { IExecutionResponse } from '@/Interface';
 
 export function usePushConnection({ router }: { router: ReturnType<typeof useRouter> }) {
 	const workflowHelpers = useWorkflowHelpers({ router });
@@ -145,7 +146,11 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 			return false;
 		}
 
-		if (receivedData.type === 'nodeExecuteAfter' || receivedData.type === 'nodeExecuteBefore') {
+		if (
+			receivedData.type === 'nodeExecuteAfter' ||
+			receivedData.type === 'nodeExecuteBefore' ||
+			receivedData.type === 'executionStarted'
+		) {
 			if (!uiStore.isActionActive['workflowRunning']) {
 				// No workflow is running so ignore the messages
 				return false;
@@ -205,11 +210,19 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 				return false;
 			}
 
-			// pull execution data for the execution from the server
-			const executionData = await workflowsStore.fetchExecutionDataById(executionId);
-			if (!executionData?.data) return false;
-			// data comes in as 'flatten' object, so we need to parse it
-			executionData.data = parse(executionData.data as unknown as string) as IRunExecutionData;
+			let executionData: Pick<IExecutionResponse, 'workflowId' | 'data' | 'status'>;
+			if (receivedData.type === 'executionFinished' && receivedData.data.rawData) {
+				const { workflowId, status, rawData } = receivedData.data;
+				executionData = { workflowId, data: parse(rawData), status };
+			} else {
+				const execution = await workflowsStore.fetchExecutionDataById(executionId);
+				if (!execution?.data) return false;
+				executionData = {
+					workflowId: execution.workflowId,
+					data: parse(execution.data as unknown as string),
+					status: execution.status,
+				};
+			}
 
 			const iRunExecutionData: IRunExecutionData = {
 				startData: executionData.data?.startData,
@@ -265,7 +278,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 
 				// Workflow did start but had been put to wait
 				workflowHelpers.setDocumentTitle(workflow.name as string, 'IDLE');
-			} else if (executionData.finished !== true) {
+			} else if (executionData.status === 'error' || executionData.status === 'canceled') {
 				workflowHelpers.setDocumentTitle(workflow.name as string, 'ERROR');
 
 				if (
@@ -347,17 +360,14 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 						duration: 0,
 					});
 				} else {
-					let title: string;
-					const isManualExecutionCancelled =
-						executionData.mode === 'manual' && executionData.status === 'canceled';
-
-					// Do not show the error message if the workflow got canceled manually
-					if (isManualExecutionCancelled) {
+					// Do not show the error message if the workflow got canceled
+					if (executionData.status === 'canceled') {
 						toast.showMessage({
 							title: i18n.baseText('nodeView.showMessage.stopExecutionTry.title'),
 							type: 'success',
 						});
 					} else {
+						let title: string;
 						if (iRunExecutionData.resultData.lastNodeExecuted) {
 							title = `Problem in node ‘${iRunExecutionData.resultData.lastNodeExecuted}‘`;
 						} else {
@@ -421,7 +431,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 			}
 
 			workflowsStore.executingNode.length = 0;
-			workflowsStore.setWorkflowExecutionData(executionData);
+			workflowsStore.setWorkflowExecutionData(executionData as IExecutionResponse);
 			uiStore.removeActiveAction('workflowRunning');
 
 			// Set the node execution issues on all the nodes which produced an error so that
@@ -449,7 +459,11 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 		} else if (receivedData.type === 'executionWaiting') {
 			// Nothing to do
 		} else if (receivedData.type === 'executionStarted') {
-			// Nothing to do
+			if (workflowsStore.workflowExecutionData?.data && receivedData.data.flattedRunData) {
+				workflowsStore.workflowExecutionData.data.resultData.runData = parse(
+					receivedData.data.flattedRunData,
+				);
+			}
 		} else if (receivedData.type === 'nodeExecuteAfter') {
 			// A node finished to execute. Add its data
 			const pushData = receivedData.data;
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.test.ts b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
index 7a29fcd098..4a09e2e943 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.test.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
@@ -2,7 +2,13 @@ import { setActivePinia } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
 import { useRouter } from 'vue-router';
 import type router from 'vue-router';
-import { ExpressionError, type IPinData, type IRunData, type Workflow } from 'n8n-workflow';
+import {
+	ExpressionError,
+	type IPinData,
+	type IRunData,
+	type Workflow,
+	type IExecuteData,
+} from 'n8n-workflow';
 
 import { useRootStore } from '@/stores/root.store';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
@@ -12,6 +18,8 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useToast } from './useToast';
 import { useI18n } from '@/composables/useI18n';
+import { useLocalStorage } from '@vueuse/core';
+import { ref } from 'vue';
 
 vi.mock('@/stores/workflows.store', () => ({
 	useWorkflowsStore: vi.fn().mockReturnValue({
@@ -26,9 +34,21 @@ vi.mock('@/stores/workflows.store', () => ({
 		getNodeByName: vi.fn(),
 		getExecution: vi.fn(),
 		nodeIssuesExit: vi.fn(),
+		checkIfNodeHasChatParent: vi.fn(),
+		getParametersLastUpdate: vi.fn(),
 	}),
 }));
 
+vi.mock('@vueuse/core', async () => {
+	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+	const originalModule = await vi.importActual<typeof import('@vueuse/core')>('@vueuse/core');
+
+	return {
+		...originalModule, // Keep all original exports
+		useLocalStorage: vi.fn().mockReturnValue({ value: undefined }), // Mock useLocalStorage
+	};
+});
+
 vi.mock('@/composables/useTelemetry', () => ({
 	useTelemetry: vi.fn().mockReturnValue({ track: vi.fn() }),
 }));
@@ -57,6 +77,7 @@ vi.mock('@/composables/useWorkflowHelpers', () => ({
 		saveCurrentWorkflow: vi.fn(),
 		getWorkflowDataToSave: vi.fn(),
 		setDocumentTitle: vi.fn(),
+		executeData: vi.fn(),
 	}),
 }));
 
@@ -99,6 +120,7 @@ describe('useRunWorkflow({ router })', () => {
 
 	beforeEach(() => {
 		uiStore.activeActions = [];
+		vi.clearAllMocks();
 	});
 
 	describe('runWorkflowApi()', () => {
@@ -168,8 +190,6 @@ describe('useRunWorkflow({ router })', () => {
 		it('should prevent execution and show error message when workflow is active with single webhook trigger', async () => {
 			const pinia = createTestingPinia({ stubActions: false });
 			setActivePinia(pinia);
-			const router = useRouter();
-			const workflowsStore = useWorkflowsStore();
 			const toast = useToast();
 			const i18n = useI18n();
 			const { runWorkflow } = useRunWorkflow({ router });
@@ -250,6 +270,120 @@ describe('useRunWorkflow({ router })', () => {
 			const result = await runWorkflow({});
 			expect(result).toEqual(mockExecutionResponse);
 		});
+
+		it('should send dirty nodes for partial executions', async () => {
+			vi.mocked(useLocalStorage).mockReturnValueOnce(ref(1));
+			const composable = useRunWorkflow({ router });
+			const parentName = 'When clicking';
+			const executeName = 'Code';
+			vi.mocked(workflowsStore).getWorkflowRunData = {
+				[parentName]: [
+					{
+						startTime: 1,
+						executionTime: 0,
+						source: [],
+					},
+				],
+				[executeName]: [
+					{
+						startTime: 1,
+						executionTime: 8,
+						source: [
+							{
+								previousNode: parentName,
+							},
+						],
+					},
+				],
+			};
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
+				name: 'Test Workflow',
+				getParentNodes: () => [parentName],
+				nodes: { [parentName]: {} },
+			} as unknown as Workflow);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
+				nodes: [],
+			} as unknown as IWorkflowData);
+			vi.mocked(workflowHelpers).executeData.mockResolvedValue({
+				data: {},
+				node: {},
+				source: null,
+			} as IExecuteData);
+
+			vi.mocked(workflowsStore).checkIfNodeHasChatParent.mockReturnValue(false);
+			vi.mocked(workflowsStore).getParametersLastUpdate.mockImplementation((name: string) => {
+				if (name === executeName) return 2;
+				return undefined;
+			});
+
+			const { runWorkflow } = composable;
+
+			await runWorkflow({ destinationNode: 'Code 1', source: 'Node.executeNode' });
+
+			expect(workflowsStore.runWorkflow).toHaveBeenCalledWith(
+				expect.objectContaining({ dirtyNodeNames: [executeName] }),
+			);
+		});
+
+		it('does not use the original run data if `PartialExecution.version` is set to 0', async () => {
+			// ARRANGE
+			const mockExecutionResponse = { executionId: '123' };
+			const mockRunData = { nodeName: [] };
+			const { runWorkflow } = useRunWorkflow({ router });
+
+			vi.mocked(useLocalStorage).mockReturnValueOnce(ref(0));
+			vi.mocked(rootStore).pushConnectionActive = true;
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).nodesIssuesExist = false;
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
+				name: 'Test Workflow',
+			} as Workflow);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
+				id: 'workflowId',
+				nodes: [],
+			} as unknown as IWorkflowData);
+			vi.mocked(workflowsStore).getWorkflowRunData = mockRunData;
+
+			// ACT
+			const result = await runWorkflow({});
+
+			// ASSERT
+			expect(result).toEqual(mockExecutionResponse);
+			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalledTimes(1);
+			expect(vi.mocked(workflowsStore.setWorkflowExecutionData).mock.calls[0][0]).toMatchObject({
+				data: { resultData: { runData: {} } },
+			});
+		});
+
+		it('retains the original run data if `PartialExecution.version` is set to 1', async () => {
+			// ARRANGE
+			const mockExecutionResponse = { executionId: '123' };
+			const mockRunData = { nodeName: [] };
+			const { runWorkflow } = useRunWorkflow({ router });
+
+			vi.mocked(useLocalStorage).mockReturnValueOnce(ref(1));
+			vi.mocked(rootStore).pushConnectionActive = true;
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).nodesIssuesExist = false;
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
+				name: 'Test Workflow',
+			} as Workflow);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
+				id: 'workflowId',
+				nodes: [],
+			} as unknown as IWorkflowData);
+			vi.mocked(workflowsStore).getWorkflowRunData = mockRunData;
+
+			// ACT
+			const result = await runWorkflow({});
+
+			// ASSERT
+			expect(result).toEqual(mockExecutionResponse);
+			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalledTimes(1);
+			expect(vi.mocked(workflowsStore.setWorkflowExecutionData).mock.calls[0][0]).toMatchObject({
+				data: { resultData: { runData: mockRunData } },
+			});
+		});
 	});
 
 	describe('consolidateRunDataAndStartNodes()', () => {
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
index eaa91a6228..6b7dc9fda5 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -37,6 +37,25 @@ import { get } from 'lodash-es';
 import { useExecutionsStore } from '@/stores/executions.store';
 import { useLocalStorage } from '@vueuse/core';
 
+const getDirtyNodeNames = (
+	runData: IRunData,
+	getParametersLastUpdate: (nodeName: string) => number | undefined,
+): string[] | undefined => {
+	const dirtyNodeNames = Object.entries(runData).reduce<string[]>((acc, [nodeName, tasks]) => {
+		if (!tasks.length) return acc;
+
+		const updatedAt = getParametersLastUpdate(nodeName) ?? 0;
+
+		if (updatedAt > tasks[0].startTime) {
+			acc.push(nodeName);
+		}
+
+		return acc;
+	}, []);
+
+	return dirtyNodeNames.length ? dirtyNodeNames : undefined;
+};
+
 export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof useRouter> }) {
 	const nodeHelpers = useNodeHelpers();
 	const workflowHelpers = useWorkflowHelpers({ router: useRunWorkflowOpts.router });
@@ -244,6 +263,13 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				startRunData.destinationNode = options.destinationNode;
 			}
 
+			if (startRunData.runData) {
+				startRunData.dirtyNodeNames = getDirtyNodeNames(
+					startRunData.runData,
+					workflowsStore.getParametersLastUpdate,
+				);
+			}
+
 			// Init the execution data to represent the start of the execution
 			// that data which gets reused is already set and data of newly executed
 			// nodes can be added as it gets pushed in
@@ -259,7 +285,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				executedNode,
 				data: {
 					resultData: {
-						runData: newRunData ?? {},
+						runData: startRunData.runData ?? {},
 						pinData: workflowData.pinData,
 						workflowData,
 					},
diff --git a/packages/editor-ui/src/composables/useStyles.test.ts b/packages/editor-ui/src/composables/useStyles.test.ts
index 2e27979b3e..cf6eebd549 100644
--- a/packages/editor-ui/src/composables/useStyles.test.ts
+++ b/packages/editor-ui/src/composables/useStyles.test.ts
@@ -17,9 +17,15 @@ describe('useStyles', () => {
 			'--z-index-canvas-add-button',
 			'101',
 		);
-		expect(global.document.documentElement.style.setProperty).toHaveBeenLastCalledWith(
+
+		expect(global.document.documentElement.style.setProperty).toHaveBeenCalledWith(
 			'--z-index-workflow-preview-ndv',
 			'9999999',
 		);
+
+		expect(global.document.documentElement.style.setProperty).toHaveBeenLastCalledWith(
+			'--z-index-nps-survey-modal',
+			'3001',
+		);
 	});
 });
diff --git a/packages/editor-ui/src/composables/useStyles.ts b/packages/editor-ui/src/composables/useStyles.ts
index dc1db3ade3..f2a321aefa 100644
--- a/packages/editor-ui/src/composables/useStyles.ts
+++ b/packages/editor-ui/src/composables/useStyles.ts
@@ -15,6 +15,7 @@ const APP_Z_INDEXES = {
 	DRAGGABLE: 9999999,
 	ACTIVE_STICKY: 9999999,
 	WORKFLOW_PREVIEW_NDV: 9999999,
+	NPS_SURVEY_MODAL: 3001,
 } as const;
 
 const setAppZIndexes = () => {
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
index 87492ac545..23200cdc76 100644
--- a/packages/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -55,7 +55,6 @@ import { useTemplatesStore } from '@/stores/templates.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 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';
@@ -64,13 +63,12 @@ import { useCanvasStore } from '@/stores/canvas.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { useI18n } from '@/composables/useI18n';
-import type { useRouter } from 'vue-router';
+import type { useRouter, NavigationGuardNext } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useProjectsStore } from '@/stores/projects.store';
 import { useTagsStore } from '@/stores/tags.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
-import type { NavigationGuardNext } from 'vue-router';
 
 type ResolveParameterOptions = {
 	targetItem?: TargetItem;
@@ -937,7 +935,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 
 			if (resetNodeIds) {
 				workflowDataRequest.nodes = workflowDataRequest.nodes!.map((node) => {
-					node.id = uuid();
+					nodeHelpers.assignNodeId(node);
 
 					return node;
 				});
@@ -946,8 +944,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 			if (resetWebhookUrls) {
 				workflowDataRequest.nodes = workflowDataRequest.nodes!.map((node) => {
 					if (node.webhookId) {
-						const newId = uuid();
-						node.webhookId = newId;
+						const newId = nodeHelpers.assignWebhookId(node);
 						node.parameters.path = newId;
 						changedNodes[node.name] = node.webhookId;
 					}
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 90332668f3..0ee70b9929 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -495,6 +495,9 @@ export const enum VIEWS {
 	COMMUNITY_NODES = 'CommunityNodes',
 	WORKFLOWS = 'WorkflowsView',
 	WORKFLOW_EXECUTIONS = 'WorkflowExecutions',
+	TEST_DEFINITION = 'TestDefinition',
+	TEST_DEFINITION_EDIT = 'TestDefinitionEdit',
+	NEW_TEST_DEFINITION = 'NewTestDefinition',
 	USAGE = 'Usage',
 	LOG_STREAMING_SETTINGS = 'LogStreamingSettingsView',
 	SSO_SETTINGS = 'SSoSettings',
@@ -591,6 +594,7 @@ export const enum MAIN_HEADER_TABS {
 	WORKFLOW = 'workflow',
 	EXECUTIONS = 'executions',
 	SETTINGS = 'settings',
+	TEST_DEFINITION = 'testDefinition',
 }
 export const CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS = [
 	'ftp',
@@ -652,6 +656,7 @@ export const enum STORES {
 	ASSISTANT = 'assistant',
 	BECOME_TEMPLATE_CREATOR = 'becomeTemplateCreator',
 	PROJECTS = 'projects',
+	TEST_DEFINITION = 'testDefinition',
 }
 
 export const enum SignInType {
@@ -709,6 +714,8 @@ export const EXPERIMENTS_TO_TRACK = [
 	CREDENTIAL_DOCS_EXPERIMENT.name,
 ];
 
+export const WORKFLOW_EVALUATION_EXPERIMENT = '025_workflow_evaluation';
+
 export const MFA_FORM = {
 	MFA_TOKEN: 'MFA_TOKEN',
 	MFA_RECOVERY_CODE: 'MFA_RECOVERY_CODE',
diff --git a/packages/editor-ui/src/init.test.ts b/packages/editor-ui/src/init.test.ts
index d7b381e3f5..d4e366988b 100644
--- a/packages/editor-ui/src/init.test.ts
+++ b/packages/editor-ui/src/init.test.ts
@@ -8,6 +8,13 @@ import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useVersionsStore } from '@/stores/versions.store';
+import { AxiosError } from 'axios';
+
+const showMessage = vi.fn();
+
+vi.mock('@/composables/useToast', () => ({
+	useToast: () => ({ showMessage }),
+}));
 
 vi.mock('@/stores/users.store', () => ({
 	useUsersStore: vi.fn().mockReturnValue({ initialize: vi.fn() }),
@@ -108,5 +115,21 @@ describe('Init', () => {
 
 			expect(cloudStoreSpy).toHaveBeenCalledTimes(1);
 		});
+
+		it('should handle source control initialization error', async () => {
+			vi.mocked(useUsersStore).mockReturnValue({ currentUser: { id: '123' } } as ReturnType<
+				typeof useUsersStore
+			>);
+			vi.spyOn(sourceControlStore, 'getPreferences').mockRejectedValueOnce(
+				new AxiosError('Something went wrong', '404'),
+			);
+			const consoleSpy = vi.spyOn(window.console, 'error');
+			await initializeAuthenticatedFeatures(false);
+			expect(showMessage).toHaveBeenCalled();
+			expect(consoleSpy).toHaveBeenCalledWith(
+				'Failed to initialize source control store',
+				expect.anything(),
+			);
+		});
 	});
 });
diff --git a/packages/editor-ui/src/init.ts b/packages/editor-ui/src/init.ts
index dfdcbe42d2..8b3a69f820 100644
--- a/packages/editor-ui/src/init.ts
+++ b/packages/editor-ui/src/init.ts
@@ -1,3 +1,4 @@
+import { h } from 'vue';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRootStore } from '@/stores/root.store';
@@ -8,6 +9,9 @@ import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useVersionsStore } from '@/stores/versions.store';
 import { useProjectsStore } from '@/stores/projects.store';
 import { useRolesStore } from './stores/roles.store';
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import SourceControlInitializationErrorMessage from '@/components/SourceControlInitializationErrorMessage.vue';
 
 let coreInitialized = false;
 let authenticatedFeaturesInitialized = false;
@@ -41,8 +45,10 @@ export async function initializeCore() {
 /**
  * Initializes the features of the application that require an authenticated user
  */
-export async function initializeAuthenticatedFeatures() {
-	if (authenticatedFeaturesInitialized) {
+export async function initializeAuthenticatedFeatures(
+	initialized: boolean = authenticatedFeaturesInitialized,
+) {
+	if (initialized) {
 		return;
 	}
 
@@ -51,6 +57,8 @@ export async function initializeAuthenticatedFeatures() {
 		return;
 	}
 
+	const i18n = useI18n();
+	const toast = useToast();
 	const sourceControlStore = useSourceControlStore();
 	const settingsStore = useSettingsStore();
 	const rootStore = useRootStore();
@@ -60,7 +68,17 @@ export async function initializeAuthenticatedFeatures() {
 	const rolesStore = useRolesStore();
 
 	if (sourceControlStore.isEnterpriseSourceControlEnabled) {
-		await sourceControlStore.getPreferences();
+		try {
+			await sourceControlStore.getPreferences();
+		} catch (e) {
+			toast.showMessage({
+				title: i18n.baseText('settings.sourceControl.connection.error'),
+				message: h(SourceControlInitializationErrorMessage),
+				type: 'error',
+				duration: 0,
+			});
+			console.error('Failed to initialize source control store', e);
+		}
 	}
 
 	if (settingsStore.isTemplatesEnabled) {
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index 05064ca78a..33fa11cb5f 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -4,6 +4,7 @@
 :root {
 	// Using native css variable enables us to use this value in JS
 	--header-height: 65;
+	--content-container-width: 1280px;
 }
 
 .clickable {
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index e78fd1b105..bd6ac9736f 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -47,6 +47,7 @@
 	"generic.delete": "Delete",
 	"generic.dontShowAgain": "Don't show again",
 	"generic.executions": "Executions",
+	"generic.tests": "Tests",
 	"generic.or": "or",
 	"generic.clickToCopy": "Click to copy",
 	"generic.copiedToClipboard": "Copied to clipboard",
@@ -169,6 +170,7 @@
 	"binaryDataDisplay.backToOverviewPage": "Back to overview page",
 	"binaryDataDisplay.noDataFoundToDisplay": "No data found to display",
 	"binaryDataDisplay.yourBrowserDoesNotSupport": "Your browser does not support the video element. Kindly update it to latest version.",
+	"chat.hide": "Hide chat",
 	"chat.window.title": "Chat",
 	"chat.window.logs": "Latest Logs",
 	"chat.window.logsFromNode": "from {nodeName} node",
@@ -696,6 +698,9 @@
 	"executionsLandingPage.emptyState.accordion.footer.tooltipLink": "Save your workflow",
 	"executionsLandingPage.emptyState.accordion.footer.tooltipText": "in order to access workflow settings",
 	"executionsLandingPage.noResults": "No executions found",
+	"executionsList.activeExecutions.none": "No active executions",
+	"executionsList.activeExecutions.header": "{running}/{cap} active executions",
+	"executionsList.activeExecutions.tooltip": "Current active executions: {running} out of {cap} allowed by your plan. Upgrade to increase the limit.",
 	"executionsList.allWorkflows": "All Workflows",
 	"executionsList.anyStatus": "Any Status",
 	"executionsList.autoRefresh": "Auto refresh",
@@ -763,6 +768,8 @@
 	"executionsList.workflowExecutions": "Executions",
 	"executionsList.view": "View",
 	"executionsList.stop": "Stop",
+	"executionsList.statusTooltipText.waitingForWebhook": "The workflow is waiting indefinitely for an incoming webhook call.",
+	"executionsList.statusTooltipText.waitingForConcurrencyCapacity": "This execution will start once concurrency capacity is available. This instance is limited to {concurrencyCap} concurrent production executions.",
 	"executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely": "The workflow is waiting indefinitely for an incoming webhook call.",
 	"executionsList.debug.button.copyToEditor": "Copy to editor",
 	"executionsList.debug.button.debugInEditor": "Debug in editor",
@@ -833,6 +840,7 @@
 	"expressionModalInput.pairedItemConnectionError": "No path back to node",
 	"expressionModalInput.pairedItemInvalidPinnedError": "Unpin node ‘{node}’ and execute",
 	"expressionModalInput.pairedItemError": "Can’t determine which item to use",
+	"expressionModalInput.pairedItemError.noRunData": "Can't determine which item to use - execute node for more info",
 	"fixedCollectionParameter.choose": "Choose...",
 	"fixedCollectionParameter.currentlyNoItemsExist": "Currently no items exist",
 	"fixedCollectionParameter.deleteItem": "Delete item",
@@ -911,7 +919,9 @@
 	"menuActions.switchToOldNodeViewVersion": "Switch to old canvas",
 	"menuActions.badge.new": "NEW",
 	"menuActions.badge.alpha": "ALPHA",
-	"menuActions.nodeViewDiscovery.tooltip": "Try our new, more performant canvas",
+	"menuActions.badge.beta": "BETA",
+	"menuActions.nodeViewDiscovery.tooltip": "You're currently using our new, more performant canvas.",
+	"menuActions.nodeViewDiscovery.tooltip.switchBack": "You can switch back to the old version using this menu.",
 	"multipleParameter.addItem": "Add item",
 	"multipleParameter.currentlyNoItemsExist": "Currently no items exist",
 	"multipleParameter.deleteItem": "Delete item",
@@ -1872,6 +1882,9 @@
 	"settings.sourceControl.actionBox.description": "Use multiple instances for different environments (dev, prod, etc.), deploying between them via a Git repository.",
 	"settings.sourceControl.actionBox.description.link": "More info",
 	"settings.sourceControl.actionBox.buttonText": "See plans",
+	"settings.sourceControl.connection.error": "Source control failed to connect",
+	"settings.sourceControl.connection.error.message": "We couldn't find the repository connected to this instance. Please double-check your {link} on this instance.",
+	"settings.sourceControl.connection.error.link": "Git configuration",
 	"settings.sourceControl.description": "Use multiple instances for different environments (dev, prod, etc.), deploying between them via a Git repository. {link}",
 	"settings.sourceControl.description.link": "More info",
 	"settings.sourceControl.gitConfig": "Git configuration",
@@ -2716,5 +2729,47 @@
 	"communityPlusModal.button.skip": "Skip",
 	"communityPlusModal.button.confirm": "Send me a free license key",
 	"executeWorkflowTrigger.createNewSubworkflow": "Create a sub-workflow in {projectName}",
-	"executeWorkflowTrigger.createNewSubworkflow.noProject": "Create a new sub-workflow"
+	"executeWorkflowTrigger.createNewSubworkflow.noProject": "Create a new sub-workflow",
+	"testDefinition.edit.descriptionPlaceholder": "",
+	"testDefinition.edit.backButtonTitle": "Back to Workflow Evaluation",
+	"testDefinition.edit.namePlaceholder": "Enter test name",
+	"testDefinition.edit.metricsTitle": "Metrics",
+	"testDefinition.edit.metricsHelpText": "The output field of the last node in the evaluation workflow. Metrics will be averaged across all test cases.",
+	"testDefinition.edit.metricsFields": "Output field(s)",
+	"testDefinition.edit.metricsPlaceholder": "Enter metric name",
+	"testDefinition.edit.metricsNew": "New metric",
+	"testDefinition.edit.selectTag": "Select tag...",
+	"testDefinition.edit.tagsHelpText": "Executions with this tag will be added as test cases to this test.",
+	"testDefinition.edit.workflowSelectorLabel": "Workflow to make comparisons",
+	"testDefinition.edit.workflowSelectorDisplayName": "Workflow",
+	"testDefinition.edit.workflowSelectorTitle": "Workflow to make comparisons",
+	"testDefinition.edit.workflowSelectorHelpText": "This workflow will be called once for each test case.",
+	"testDefinition.edit.updateTest": "Update test",
+	"testDefinition.edit.saveTest": "Run test",
+	"testDefinition.edit.testSaved": "Test saved",
+	"testDefinition.edit.testSaveFailed": "Failed to save test",
+	"testDefinition.edit.description": "Description",
+	"testDefinition.edit.tagName": "Tag name",
+	"testDefinition.edit.step.intro": "When running a test",
+	"testDefinition.edit.step.executions": "Fetch 5 past executions",
+	"testDefinition.edit.step.nodes": "Mock nodes",
+	"testDefinition.edit.step.mockedNodes": "No nodes mocked | {count} node mocked | {count} nodes mocked",
+	"testDefinition.edit.step.reRunExecutions": "Re-run executions",
+	"testDefinition.edit.step.compareExecutions": "Compare each past and new execution",
+	"testDefinition.edit.step.metrics": "Summarise metrics",
+	"testDefinition.edit.step.collapse": "Collapse",
+	"testDefinition.edit.step.expand": "Expand",
+	"testDefinition.list.testDeleted": "Test deleted",
+	"testDefinition.list.tests": "Tests",
+	"testDefinition.list.createNew": "Create new test",
+	"testDefinition.list.actionDescription": "Replay past executions to check whether performance has changed",
+	"testDefinition.list.actionButton": "Create Test",
+	"testDefinition.list.testCases": "No test cases | {count} test case | {count} test cases",
+	"testDefinition.list.lastRun": "Ran {lastRun}",
+	"testDefinition.list.errorRate": "Error rate: {errorRate}",
+	"testDefinition.runTest": "Run Test",
+	"testDefinition.notImplemented": "This feature is not implemented yet!",
+	"testDefinition.viewDetails": "View Details",
+	"testDefinition.editTest": "Edit Test",
+	"testDefinition.deleteTest": "Delete Test"
 }
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index 0e9430d8ae..561ad6afbf 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -51,6 +51,7 @@ import {
 	faEllipsisH,
 	faEllipsisV,
 	faEnvelope,
+	faEquals,
 	faEye,
 	faExclamationTriangle,
 	faExpand,
@@ -223,6 +224,7 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faEllipsisH);
 		addIcon(faEllipsisV);
 		addIcon(faEnvelope);
+		addIcon(faEquals);
 		addIcon(faEye);
 		addIcon(faExclamationTriangle);
 		addIcon(faExpand);
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index 1580a3bff4..f3bf9f656a 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -57,6 +57,10 @@ const SettingsExternalSecrets = async () => await import('./views/SettingsExtern
 const WorkerView = async () => await import('./views/WorkerView.vue');
 const WorkflowHistory = async () => await import('@/views/WorkflowHistory.vue');
 const WorkflowOnboardingView = async () => await import('@/views/WorkflowOnboardingView.vue');
+const TestDefinitionListView = async () =>
+	await import('./views/TestDefinition/TestDefinitionListView.vue');
+const TestDefinitionEditView = async () =>
+	await import('./views/TestDefinition/TestDefinitionEditView.vue');
 
 function getTemplatesRedirect(defaultRedirect: VIEWS[keyof VIEWS]): { name: string } | false {
 	const settingsStore = useSettingsStore();
@@ -249,6 +253,55 @@ export const routes: RouteRecordRaw[] = [
 			},
 		],
 	},
+	{
+		path: '/workflow/:name/evaluation',
+		name: VIEWS.TEST_DEFINITION,
+		meta: {
+			keepWorkflowAlive: true,
+			middleware: ['authenticated'],
+		},
+		children: [
+			{
+				path: '',
+				name: VIEWS.TEST_DEFINITION,
+				components: {
+					default: TestDefinitionListView,
+					header: MainHeader,
+					sidebar: MainSidebar,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+			{
+				path: 'new',
+				name: VIEWS.NEW_TEST_DEFINITION,
+				components: {
+					default: TestDefinitionEditView,
+					header: MainHeader,
+					sidebar: MainSidebar,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+			{
+				path: ':testId',
+				name: VIEWS.TEST_DEFINITION_EDIT,
+				components: {
+					default: TestDefinitionEditView,
+					header: MainHeader,
+					sidebar: MainSidebar,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+		],
+	},
 	{
 		path: '/workflow/:workflowId/history/:versionId?',
 		name: VIEWS.WORKFLOW_HISTORY,
diff --git a/packages/editor-ui/src/stores/executions.store.ts b/packages/editor-ui/src/stores/executions.store.ts
index b74a63325d..54ee47bacc 100644
--- a/packages/editor-ui/src/stores/executions.store.ts
+++ b/packages/editor-ui/src/stores/executions.store.ts
@@ -15,10 +15,12 @@ import { useRootStore } from '@/stores/root.store';
 import { makeRestApiRequest, unflattenExecutionData } from '@/utils/apiUtils';
 import { executionFilterToQueryFilter, getDefaultExecutionFilters } from '@/utils/executionUtils';
 import { useProjectsStore } from '@/stores/projects.store';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export const useExecutionsStore = defineStore('executions', () => {
 	const rootStore = useRootStore();
 	const projectsStore = useProjectsStore();
+	const settingsStore = useSettingsStore();
 
 	const loading = ref(false);
 	const itemsPerPage = ref(10);
@@ -67,12 +69,29 @@ export const useExecutionsStore = defineStore('executions', () => {
 	);
 
 	const currentExecutionsById = ref<Record<string, ExecutionSummaryWithScopes>>({});
+	const startedAtSortFn = (a: ExecutionSummary, b: ExecutionSummary) =>
+		new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime();
+
+	/**
+	 * Prioritize `running` over `new` executions, then sort by start timestamp.
+	 */
+	const statusThenStartedAtSortFn = (a: ExecutionSummary, b: ExecutionSummary) => {
+		if (a.status && b.status) {
+			const statusPriority: { [key: string]: number } = { running: 1, new: 2 };
+			const statusComparison = statusPriority[a.status] - statusPriority[b.status];
+
+			if (statusComparison !== 0) return statusComparison;
+		}
+
+		return startedAtSortFn(a, b);
+	};
+
+	const sortFn = settingsStore.isConcurrencyEnabled ? statusThenStartedAtSortFn : startedAtSortFn;
+
 	const currentExecutions = computed(() => {
 		const data = Object.values(currentExecutionsById.value);
 
-		data.sort((a, b) => {
-			return new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime();
-		});
+		data.sort(sortFn);
 
 		return data;
 	});
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index 7d881b74d4..822c05f4dc 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -70,6 +70,8 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 
 	const concurrency = computed(() => settings.value.concurrency);
 
+	const isConcurrencyEnabled = computed(() => concurrency.value !== -1);
+
 	const isPublicApiEnabled = computed(() => api.value.enabled);
 
 	const isSwaggerUIEnabled = computed(() => api.value.swaggerUi.enabled);
@@ -384,6 +386,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		security,
 		nodeJsVersion,
 		concurrency,
+		isConcurrencyEnabled,
 		isPublicApiEnabled,
 		isSwaggerUIEnabled,
 		isPreviewMode,
diff --git a/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts b/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
new file mode 100644
index 0000000000..702701a495
--- /dev/null
+++ b/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
@@ -0,0 +1,264 @@
+import { createPinia, setActivePinia } from 'pinia';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee'; // Adjust the import path as necessary
+import { useRootStore } from '@/stores/root.store';
+import { usePostHog } from '@/stores/posthog.store';
+import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+
+const { createTestDefinition, deleteTestDefinition, getTestDefinitions, updateTestDefinition } =
+	vi.hoisted(() => ({
+		getTestDefinitions: vi.fn(),
+		createTestDefinition: vi.fn(),
+		updateTestDefinition: vi.fn(),
+		deleteTestDefinition: vi.fn(),
+	}));
+
+vi.mock('@/api/testDefinition.ee', () => ({
+	createTestDefinition,
+	deleteTestDefinition,
+	getTestDefinitions,
+	updateTestDefinition,
+}));
+
+vi.mock('@/stores/root.store', () => ({
+	useRootStore: vi.fn(() => ({
+		restApiContext: { instanceId: 'test-instance-id' },
+	})),
+}));
+
+const TEST_DEF_A: TestDefinitionRecord = {
+	id: '1',
+	name: 'Test Definition A',
+	workflowId: '123',
+	description: 'Description A',
+};
+const TEST_DEF_B: TestDefinitionRecord = {
+	id: '2',
+	name: 'Test Definition B',
+	workflowId: '123',
+	description: 'Description B',
+};
+const TEST_DEF_NEW: TestDefinitionRecord = {
+	id: '3',
+	name: 'New Test Definition',
+	workflowId: '123',
+	description: 'New Description',
+};
+
+describe('testDefinition.store.ee', () => {
+	let store: ReturnType<typeof useTestDefinitionStore>;
+	let rootStoreMock: ReturnType<typeof useRootStore>;
+	let posthogStoreMock: ReturnType<typeof usePostHog>;
+
+	beforeEach(() => {
+		vi.restoreAllMocks();
+		setActivePinia(createPinia());
+		store = useTestDefinitionStore();
+		rootStoreMock = useRootStore();
+		posthogStoreMock = usePostHog();
+
+		getTestDefinitions.mockResolvedValue({
+			count: 2,
+			testDefinitions: [TEST_DEF_A, TEST_DEF_B],
+		});
+
+		createTestDefinition.mockResolvedValue(TEST_DEF_NEW);
+
+		deleteTestDefinition.mockResolvedValue({ success: true });
+	});
+
+	test('Initialization', () => {
+		expect(store.testDefinitionsById).toEqual({});
+		expect(store.isLoading).toBe(false);
+		expect(store.hasTestDefinitions).toBe(false);
+	});
+
+	test('Fetching Test Definitions', async () => {
+		expect(store.isLoading).toBe(false);
+
+		const result = await store.fetchAll();
+
+		expect(getTestDefinitions).toHaveBeenCalledWith(rootStoreMock.restApiContext);
+		expect(store.testDefinitionsById).toEqual({
+			'1': TEST_DEF_A,
+			'2': TEST_DEF_B,
+		});
+		expect(store.isLoading).toBe(false);
+		expect(result).toEqual({
+			count: 2,
+			testDefinitions: [TEST_DEF_A, TEST_DEF_B],
+		});
+	});
+
+	test('Fetching Test Definitions with force flag', async () => {
+		expect(store.isLoading).toBe(false);
+
+		const result = await store.fetchAll({ force: true });
+
+		expect(getTestDefinitions).toHaveBeenCalledWith(rootStoreMock.restApiContext);
+		expect(store.testDefinitionsById).toEqual({
+			'1': TEST_DEF_A,
+			'2': TEST_DEF_B,
+		});
+		expect(store.isLoading).toBe(false);
+		expect(result).toEqual({
+			count: 2,
+			testDefinitions: [TEST_DEF_A, TEST_DEF_B],
+		});
+	});
+
+	test('Fetching Test Definitions when already fetched', async () => {
+		store.fetchedAll = true;
+
+		const result = await store.fetchAll();
+
+		expect(getTestDefinitions).not.toHaveBeenCalled();
+		expect(store.testDefinitionsById).toEqual({});
+		expect(result).toEqual({
+			count: 0,
+			testDefinitions: [],
+		});
+	});
+
+	test('Upserting Test Definitions - New Definition', () => {
+		const newDefinition = TEST_DEF_NEW;
+
+		store.upsertTestDefinitions([newDefinition]);
+
+		expect(store.testDefinitionsById).toEqual({
+			'3': TEST_DEF_NEW,
+		});
+	});
+
+	test('Upserting Test Definitions - Existing Definition', () => {
+		store.testDefinitionsById = {
+			'1': TEST_DEF_A,
+		};
+
+		const updatedDefinition = {
+			id: '1',
+			name: 'Updated Test Definition A',
+			description: 'Updated Description A',
+			workflowId: '123',
+		};
+
+		store.upsertTestDefinitions([updatedDefinition]);
+
+		expect(store.testDefinitionsById).toEqual({
+			1: updatedDefinition,
+		});
+	});
+
+	test('Deleting Test Definitions', () => {
+		store.testDefinitionsById = {
+			'1': TEST_DEF_A,
+			'2': TEST_DEF_B,
+		};
+
+		store.deleteTestDefinition('1');
+
+		expect(store.testDefinitionsById).toEqual({
+			'2': TEST_DEF_B,
+		});
+	});
+
+	test('Creating a Test Definition', async () => {
+		const params = {
+			name: 'New Test Definition',
+			workflowId: 'test-workflow-id',
+			evaluationWorkflowId: 'test-evaluation-workflow-id',
+			description: 'New Description',
+		};
+
+		const result = await store.create(params);
+
+		expect(createTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+		expect(store.testDefinitionsById).toEqual({
+			'3': TEST_DEF_NEW,
+		});
+		expect(result).toEqual(TEST_DEF_NEW);
+	});
+
+	test('Updating a Test Definition', async () => {
+		store.testDefinitionsById = {
+			'1': TEST_DEF_A,
+			'2': TEST_DEF_B,
+		};
+
+		const params = {
+			id: '1',
+			name: 'Updated Test Definition A',
+			description: 'Updated Description A',
+			workflowId: '123',
+		};
+		updateTestDefinition.mockResolvedValue(params);
+
+		const result = await store.update(params);
+
+		expect(updateTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1', {
+			name: 'Updated Test Definition A',
+			description: 'Updated Description A',
+			workflowId: '123',
+		});
+		expect(store.testDefinitionsById).toEqual({
+			'1': params,
+			'2': TEST_DEF_B,
+		});
+		expect(result).toEqual(params);
+	});
+
+	test('Deleting a Test Definition by ID', async () => {
+		store.testDefinitionsById = {
+			'1': TEST_DEF_A,
+		};
+
+		const result = await store.deleteById('1');
+
+		expect(deleteTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
+		expect(store.testDefinitionsById).toEqual({});
+		expect(result).toBe(true);
+	});
+
+	test('Computed Properties - hasTestDefinitions', () => {
+		store.testDefinitionsById = {};
+
+		expect(store.hasTestDefinitions).toBe(false);
+		store.testDefinitionsById = {
+			'1': TEST_DEF_A,
+		};
+
+		expect(store.hasTestDefinitions).toBe(true);
+	});
+
+	test('Computed Properties - isFeatureEnabled', () => {
+		posthogStoreMock.isFeatureEnabled = vi.fn().mockReturnValue(false);
+
+		expect(store.isFeatureEnabled).toBe(false);
+		posthogStoreMock.isFeatureEnabled = vi.fn().mockReturnValue(true);
+
+		expect(store.isFeatureEnabled).toBe(true);
+	});
+
+	test('Error Handling - create', async () => {
+		createTestDefinition.mockRejectedValue(new Error('Create failed'));
+
+		await expect(
+			store.create({ name: 'New Test Definition', workflowId: 'test-workflow-id' }),
+		).rejects.toThrow('Create failed');
+	});
+
+	test('Error Handling - update', async () => {
+		updateTestDefinition.mockRejectedValue(new Error('Update failed'));
+
+		await expect(store.update({ id: '1', name: 'Updated Test Definition A' })).rejects.toThrow(
+			'Update failed',
+		);
+	});
+
+	test('Error Handling - deleteById', async () => {
+		deleteTestDefinition.mockResolvedValue({ success: false });
+
+		const result = await store.deleteById('1');
+
+		expect(result).toBe(false);
+	});
+});
diff --git a/packages/editor-ui/src/stores/testDefinition.store.ee.ts b/packages/editor-ui/src/stores/testDefinition.store.ee.ts
new file mode 100644
index 0000000000..6a9e3fe363
--- /dev/null
+++ b/packages/editor-ui/src/stores/testDefinition.store.ee.ts
@@ -0,0 +1,171 @@
+import { defineStore } from 'pinia';
+import { computed, ref } from 'vue';
+import { useRootStore } from './root.store';
+import * as testDefinitionsApi from '@/api/testDefinition.ee';
+import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+import { usePostHog } from './posthog.store';
+import { STORES, WORKFLOW_EVALUATION_EXPERIMENT } from '@/constants';
+
+export const useTestDefinitionStore = defineStore(
+	STORES.TEST_DEFINITION,
+	() => {
+		// State
+		const testDefinitionsById = ref<Record<string, TestDefinitionRecord>>({});
+		const loading = ref(false);
+		const fetchedAll = ref(false);
+
+		// Store instances
+		const posthogStore = usePostHog();
+		const rootStore = useRootStore();
+
+		// Computed
+		const allTestDefinitions = computed(() => {
+			return Object.values(testDefinitionsById.value).sort((a, b) =>
+				(a.name ?? '').localeCompare(b.name ?? ''),
+			);
+		});
+
+		// Enable with `window.featureFlags.override('025_workflow_evaluation', true)`
+		const isFeatureEnabled = computed(() =>
+			posthogStore.isFeatureEnabled(WORKFLOW_EVALUATION_EXPERIMENT),
+		);
+
+		const isLoading = computed(() => loading.value);
+
+		const hasTestDefinitions = computed(() => Object.keys(testDefinitionsById.value).length > 0);
+
+		// Methods
+		const setAllTestDefinitions = (definitions: TestDefinitionRecord[]) => {
+			testDefinitionsById.value = definitions.reduce(
+				(acc: Record<string, TestDefinitionRecord>, def: TestDefinitionRecord) => {
+					acc[def.id] = def;
+					return acc;
+				},
+				{},
+			);
+		};
+
+		/**
+		 * Upserts test definitions in the store.
+		 * @param toUpsertDefinitions - An array of test definitions to upsert.
+		 */
+		const upsertTestDefinitions = (toUpsertDefinitions: TestDefinitionRecord[]) => {
+			toUpsertDefinitions.forEach((toUpsertDef) => {
+				const defId = toUpsertDef.id;
+				if (!defId) throw Error('ID is required for upserting');
+				const currentDef = testDefinitionsById.value[defId];
+				testDefinitionsById.value = {
+					...testDefinitionsById.value,
+					[defId]: {
+						...currentDef,
+						...toUpsertDef,
+					},
+				};
+			});
+		};
+
+		const deleteTestDefinition = (id: string) => {
+			const { [id]: deleted, ...rest } = testDefinitionsById.value;
+			testDefinitionsById.value = rest;
+		};
+
+		/**
+		 * Fetches all test definitions from the API.
+		 * @param {boolean} force - If true, fetches the definitions from the API even if they were already fetched before.
+		 */
+		const fetchAll = async (params?: { force?: boolean }) => {
+			const { force = false } = params ?? {};
+			if (!force && fetchedAll.value) {
+				const testDefinitions = Object.values(testDefinitionsById.value);
+				return {
+					count: testDefinitions.length,
+					testDefinitions,
+				};
+			}
+
+			loading.value = true;
+			try {
+				const retrievedDefinitions = await testDefinitionsApi.getTestDefinitions(
+					rootStore.restApiContext,
+				);
+
+				setAllTestDefinitions(retrievedDefinitions.testDefinitions);
+				fetchedAll.value = true;
+				return retrievedDefinitions;
+			} finally {
+				loading.value = false;
+			}
+		};
+
+		/**
+		 * Creates a new test definition using the provided parameters.
+		 *
+		 * @param {Object} params - An object containing the necessary parameters to create a test definition.
+		 * @param {string} params.name - The name of the new test definition.
+		 * @param {string} params.workflowId - The ID of the workflow associated with the test definition.
+		 * @returns {Promise<TestDefinitionRecord>} A promise that resolves to the newly created test definition.
+		 * @throws {Error} Throws an error if there is a problem creating the test definition.
+		 */
+		const create = async (params: {
+			name: string;
+			workflowId: string;
+		}) => {
+			const createdDefinition = await testDefinitionsApi.createTestDefinition(
+				rootStore.restApiContext,
+				params,
+			);
+			upsertTestDefinitions([createdDefinition]);
+			return createdDefinition;
+		};
+
+		const update = async (params: Partial<TestDefinitionRecord>) => {
+			if (!params.id) throw new Error('ID is required to update a test definition');
+
+			const { id, ...updateParams } = params;
+			const updatedDefinition = await testDefinitionsApi.updateTestDefinition(
+				rootStore.restApiContext,
+				id,
+				updateParams,
+			);
+			upsertTestDefinitions([updatedDefinition]);
+			return updatedDefinition;
+		};
+
+		/**
+		 * Deletes a test definition by its ID.
+		 *
+		 * @param {number} id - The ID of the test definition to delete.
+		 * @returns {Promise<boolean>} A promise that resolves to true if the test definition was successfully deleted, false otherwise.
+		 */
+		const deleteById = async (id: string) => {
+			const result = await testDefinitionsApi.deleteTestDefinition(rootStore.restApiContext, id);
+
+			if (result.success) {
+				deleteTestDefinition(id);
+			}
+
+			return result.success;
+		};
+
+		return {
+			// State
+			fetchedAll,
+			testDefinitionsById,
+
+			// Computed
+			allTestDefinitions,
+			isLoading,
+			hasTestDefinitions,
+			isFeatureEnabled,
+
+			// Methods
+			fetchAll,
+			create,
+			update,
+			deleteById,
+			upsertTestDefinitions,
+			deleteTestDefinition,
+		};
+	},
+	{},
+);
diff --git a/packages/editor-ui/src/stores/workflows.store.test.ts b/packages/editor-ui/src/stores/workflows.store.test.ts
index 1ed19aae24..f6d829c71c 100644
--- a/packages/editor-ui/src/stores/workflows.store.test.ts
+++ b/packages/editor-ui/src/stores/workflows.store.test.ts
@@ -618,6 +618,51 @@ describe('useWorkflowsStore', () => {
 			});
 		});
 	});
+
+	describe('setNodeValue()', () => {
+		it('should update a node', () => {
+			const nodeName = 'Edit Fields';
+			workflowsStore.addNode({
+				parameters: {},
+				id: '554c7ff4-7ee2-407c-8931-e34234c5056a',
+				name: nodeName,
+				type: 'n8n-nodes-base.set',
+				position: [680, 180],
+				typeVersion: 3.4,
+			});
+
+			expect(workflowsStore.nodeMetadata[nodeName].parametersLastUpdatedAt).toBe(undefined);
+
+			workflowsStore.setNodeValue({ name: 'Edit Fields', key: 'executeOnce', value: true });
+
+			expect(workflowsStore.workflow.nodes[0].executeOnce).toBe(true);
+			expect(workflowsStore.nodeMetadata[nodeName].parametersLastUpdatedAt).toEqual(
+				expect.any(Number),
+			);
+		});
+	});
+
+	describe('setNodePositionById()', () => {
+		it('should NOT update parametersLastUpdatedAt', () => {
+			const nodeName = 'Edit Fields';
+			const nodeId = '554c7ff4-7ee2-407c-8931-e34234c5056a';
+			workflowsStore.addNode({
+				parameters: {},
+				id: nodeId,
+				name: nodeName,
+				type: 'n8n-nodes-base.set',
+				position: [680, 180],
+				typeVersion: 3.4,
+			});
+
+			expect(workflowsStore.nodeMetadata[nodeName].parametersLastUpdatedAt).toBe(undefined);
+
+			workflowsStore.setNodePositionById(nodeId, [0, 0]);
+
+			expect(workflowsStore.workflow.nodes[0].position).toStrictEqual([0, 0]);
+			expect(workflowsStore.nodeMetadata[nodeName].parametersLastUpdatedAt).toBe(undefined);
+		});
+	});
 });
 
 function getMockEditFieldsNode() {
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 43749bce49..0eb235dea2 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -84,7 +84,8 @@ import { TelemetryHelpers } from 'n8n-workflow';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useRouter } from 'vue-router';
 import { useSettingsStore } from './settings.store';
-import { openPopUpWindow } from '@/utils/executionUtils';
+import { closeFormPopupWindow, openFormPopupWindow } from '@/utils/executionUtils';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
 
 const defaults: Omit<IWorkflowDb, 'id'> & { settings: NonNullable<IWorkflowDb['settings']> } = {
 	name: '',
@@ -117,6 +118,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	const workflowHelpers = useWorkflowHelpers({ router });
 	const settingsStore = useSettingsStore();
 	const rootStore = useRootStore();
+	const nodeHelpers = useNodeHelpers();
 
 	// -1 means the backend chooses the default
 	// 0 is the old flow
@@ -141,7 +143,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	const chatMessages = ref<string[]>([]);
 	const isChatPanelOpen = ref(false);
 	const isLogsPanelOpen = ref(false);
-	const formPopupWindow = ref<Window | null>(null);
 
 	const workflowName = computed(() => workflow.value.name);
 
@@ -1037,10 +1038,15 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 	function setNodes(nodes: INodeUi[]): void {
 		workflow.value.nodes = nodes;
-		nodeMetadata.value = nodes.reduce<NodeMetadataMap>((acc, node) => {
-			acc[node.name] = { pristine: true };
-			return acc;
-		}, {});
+		nodes.forEach((node) => {
+			if (!node.id) {
+				nodeHelpers.assignNodeId(node);
+			}
+
+			if (!nodeMetadata.value[node.name]) {
+				nodeMetadata.value[node.name] = { pristine: true };
+			}
+		});
 	}
 
 	function setConnections(connections: IConnections, updateWorkflow = false): void {
@@ -1194,6 +1200,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		updateNodeAtIndex(nodeIndex, {
 			[updateInformation.key]: updateInformation.value,
 		});
+
+		if (updateInformation.key !== 'position') {
+			nodeMetadata.value[workflow.value.nodes[nodeIndex].name].parametersLastUpdatedAt = Date.now();
+		}
 	}
 
 	function setNodeParameters(updateInformation: IUpdateInformation, append?: boolean): void {
@@ -1312,12 +1322,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 				(node.type === WAIT_NODE_TYPE && node.parameters.resume === 'form')
 			) {
 				const testUrl = getFormResumeUrl(node, executionId);
-				if (!formPopupWindow.value || formPopupWindow.value.closed) {
-					formPopupWindow.value = openPopUpWindow(testUrl);
-				} else {
-					formPopupWindow.value.location = testUrl;
-					formPopupWindow.value.focus();
-				}
+				openFormPopupWindow(testUrl);
 			}
 		} else {
 			if (tasksData.length && tasksData[tasksData.length - 1].executionStatus === 'waiting') {
@@ -1570,8 +1575,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		uiStore.removeActiveAction('workflowRunning');
 		workflowHelpers.setDocumentTitle(workflowName.value, 'IDLE');
 
-		formPopupWindow.value?.close();
-		formPopupWindow.value = null;
+		closeFormPopupWindow();
 
 		const runData = workflowExecutionData.value?.data?.resultData.runData ?? {};
 		for (const nodeName in runData) {
diff --git a/packages/editor-ui/src/styles/plugins/_vueflow.scss b/packages/editor-ui/src/styles/plugins/_vueflow.scss
index ebda12c8b6..49aad6a076 100644
--- a/packages/editor-ui/src/styles/plugins/_vueflow.scss
+++ b/packages/editor-ui/src/styles/plugins/_vueflow.scss
@@ -77,6 +77,10 @@
 	}
 }
 
+.vue-flow__nodes:has(.bring-to-front) {
+	z-index: 2 !important;
+}
+
 /**
  * Selection
  */
@@ -92,8 +96,7 @@
  * Edges
  */
 
-.vue-flow__edges:has(.selected),
-.vue-flow__edges:has(.hovered),
+.vue-flow__edges:has(.bring-to-front),
 .vue-flow__edge-label.selected {
 	z-index: 1 !important;
 }
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/editor-ui/src/types/canvas.ts
index 3957e4d9c5..ad8d51ba8a 100644
--- a/packages/editor-ui/src/types/canvas.ts
+++ b/packages/editor-ui/src/types/canvas.ts
@@ -5,7 +5,14 @@ import type {
 	IConnection,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import type { DefaultEdge, Node, NodeProps, Position, OnConnectStartParams } from '@vue-flow/core';
+import type {
+	DefaultEdge,
+	Node,
+	NodeProps,
+	Position,
+	OnConnectStartParams,
+	ViewportTransform,
+} from '@vue-flow/core';
 import type { IExecutionResponse, INodeUi } from '@/Interface';
 import type { ComputedRef, Ref } from 'vue';
 import type { PartialBy } from '@/utils/typeHelpers';
@@ -59,6 +66,7 @@ export type CanvasNodeDefaultRender = {
 		outputs: {
 			labelSize: CanvasNodeDefaultRenderLabelSize;
 		};
+		tooltip?: string;
 	}>;
 };
 
@@ -118,6 +126,7 @@ export interface CanvasConnectionData {
 	target: CanvasConnectionPort;
 	fromNodeName?: string;
 	status?: 'success' | 'error' | 'pinned' | 'running';
+	maxConnections?: number;
 }
 
 export type CanvasConnection = DefaultEdge<CanvasConnectionData>;
@@ -134,8 +143,10 @@ export type CanvasConnectionCreateData = {
 };
 
 export interface CanvasInjectionData {
+	initialized: Ref<boolean>;
 	isExecuting: Ref<boolean | undefined>;
 	connectingHandle: Ref<ConnectStartEvent | undefined>;
+	viewport: Ref<ViewportTransform>;
 }
 
 export type CanvasNodeEventBusEvents = {
@@ -173,6 +184,7 @@ export interface CanvasNodeHandleInjectionData {
 	isConnected: ComputedRef<boolean | undefined>;
 	isConnecting: Ref<boolean | undefined>;
 	isReadOnly: Ref<boolean | undefined>;
+	maxConnections: Ref<number | undefined>;
 	runData: Ref<ExecutionOutputMapData | undefined>;
 }
 
diff --git a/packages/editor-ui/src/utils/canvasUtilsV2.test.ts b/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
index 088a219738..7eab644900 100644
--- a/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
+++ b/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
@@ -807,7 +807,12 @@ describe('mapLegacyEndpointsToCanvasConnectionPort', () => {
 
 		expect(result).toEqual([
 			{ type: NodeConnectionType.Main, index: 0, label: undefined },
-			{ type: NodeConnectionType.AiTool, index: 0, label: undefined },
+			{
+				type: NodeConnectionType.AiTool,
+				index: 0,
+				label: undefined,
+				maxConnections: undefined,
+			},
 		]);
 	});
 
@@ -820,7 +825,13 @@ describe('mapLegacyEndpointsToCanvasConnectionPort', () => {
 
 		expect(result).toEqual([
 			{ type: NodeConnectionType.Main, index: 0, label: 'Main Input' },
-			{ type: NodeConnectionType.AiTool, index: 0, label: 'AI Tool', required: true },
+			{
+				type: NodeConnectionType.AiTool,
+				index: 0,
+				label: 'AI Tool',
+				required: true,
+				maxConnections: undefined,
+			},
 		]);
 	});
 
@@ -834,7 +845,12 @@ describe('mapLegacyEndpointsToCanvasConnectionPort', () => {
 
 		expect(result).toEqual([
 			{ type: NodeConnectionType.Main, index: 0, label: undefined },
-			{ type: NodeConnectionType.AiTool, index: 0, label: 'AI Tool' },
+			{
+				type: NodeConnectionType.AiTool,
+				index: 0,
+				label: 'AI Tool',
+				maxConnections: undefined,
+			},
 			{ type: NodeConnectionType.Main, index: 1, label: undefined },
 		]);
 	});
@@ -874,7 +890,12 @@ describe('mapLegacyEndpointsToCanvasConnectionPort', () => {
 
 		expect(result).toEqual([
 			{ type: NodeConnectionType.Main, index: 0, label: 'Main Input', required: true },
-			{ type: NodeConnectionType.AiTool, index: 0, label: 'Optional Tool' },
+			{
+				type: NodeConnectionType.AiTool,
+				index: 0,
+				label: 'Optional Tool',
+				maxConnections: undefined,
+			},
 		]);
 	});
 
diff --git a/packages/editor-ui/src/utils/executionUtils.test.ts b/packages/editor-ui/src/utils/executionUtils.test.ts
index abcab9509f..a4f87cf3f1 100644
--- a/packages/editor-ui/src/utils/executionUtils.test.ts
+++ b/packages/editor-ui/src/utils/executionUtils.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import {
 	displayForm,
-	openPopUpWindow,
+	openFormPopupWindow,
 	executionFilterToQueryFilter,
 	waitingNodeTooltip,
 } from './executionUtils';
@@ -15,7 +15,7 @@ vi.mock('./executionUtils', async () => {
 	const actual = await vi.importActual('./executionUtils');
 	return {
 		...actual,
-		openPopUpWindow: vi.fn(),
+		openFormPopupWindow: vi.fn(),
 	};
 });
 
@@ -86,7 +86,7 @@ describe('displayForm', () => {
 			getTestUrl: getTestUrlMock,
 		});
 
-		expect(openPopUpWindow).not.toHaveBeenCalled();
+		expect(openFormPopupWindow).not.toHaveBeenCalled();
 	});
 
 	it('should skip nodes if destinationNode does not match and node is not a directParentNode', () => {
@@ -119,7 +119,7 @@ describe('displayForm', () => {
 			getTestUrl: getTestUrlMock,
 		});
 
-		expect(openPopUpWindow).not.toHaveBeenCalled();
+		expect(openFormPopupWindow).not.toHaveBeenCalled();
 	});
 
 	it('should not open pop-up if source is "RunData.ManualChatMessage"', () => {
@@ -146,7 +146,7 @@ describe('displayForm', () => {
 			getTestUrl: getTestUrlMock,
 		});
 
-		expect(openPopUpWindow).not.toHaveBeenCalled();
+		expect(openFormPopupWindow).not.toHaveBeenCalled();
 	});
 
 	describe('executionFilterToQueryFilter()', () => {
diff --git a/packages/editor-ui/src/utils/executionUtils.ts b/packages/editor-ui/src/utils/executionUtils.ts
index 014f3492b6..d8db7b8f8e 100644
--- a/packages/editor-ui/src/utils/executionUtils.ts
+++ b/packages/editor-ui/src/utils/executionUtils.ts
@@ -82,25 +82,28 @@ export const executionFilterToQueryFilter = (
 	return queryFilter;
 };
 
-export const openPopUpWindow = (
-	url: string,
-	options?: { width?: number; height?: number; alwaysInNewTab?: boolean },
-) => {
-	const windowWidth = window.innerWidth;
-	const smallScreen = windowWidth <= 800;
-	if (options?.alwaysInNewTab || smallScreen) {
-		return window.open(url, '_blank');
-	} else {
-		const height = options?.width || 700;
-		const width = options?.height || window.innerHeight - 50;
+let formPopupWindow: Window | null = null;
+
+export const openFormPopupWindow = (url: string) => {
+	if (!formPopupWindow || formPopupWindow.closed) {
+		const height = 700;
+		const width = 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`;
 		const windowName = `form-waiting-since-${Date.now()}`;
-		return window.open(url, windowName, features);
+		formPopupWindow = window.open(url, windowName, features);
+	} else {
+		formPopupWindow.location = url;
+		formPopupWindow.focus();
 	}
 };
 
+export const closeFormPopupWindow = () => {
+	formPopupWindow?.close();
+	formPopupWindow = null;
+};
+
 export function displayForm({
 	nodes,
 	runData,
@@ -131,7 +134,7 @@ export function displayForm({
 		if (node.name === destinationNode || !node.disabled) {
 			let testUrl = '';
 			if (node.type === FORM_TRIGGER_NODE_TYPE) testUrl = getTestUrl(node);
-			if (testUrl && source !== 'RunData.ManualChatMessage') openPopUpWindow(testUrl);
+			if (testUrl && source !== 'RunData.ManualChatMessage') openFormPopupWindow(testUrl);
 		}
 	}
 }
diff --git a/packages/editor-ui/src/utils/expressions.ts b/packages/editor-ui/src/utils/expressions.ts
index d641a27b53..d572006ad5 100644
--- a/packages/editor-ui/src/utils/expressions.ts
+++ b/packages/editor-ui/src/utils/expressions.ts
@@ -78,7 +78,7 @@ export const getResolvableState = (error: unknown, ignoreError = false): Resolva
 	return 'invalid';
 };
 
-export const getExpressionErrorMessage = (error: Error): string => {
+export const getExpressionErrorMessage = (error: Error, nodeHasRunData = false): string => {
 	if (isNoExecDataExpressionError(error) || isPairedItemIntermediateNodesError(error)) {
 		return i18n.baseText('expressionModalInput.noExecutionData');
 	}
@@ -109,19 +109,24 @@ export const getExpressionErrorMessage = (error: Error): string => {
 	}
 
 	if (isAnyPairedItemError(error)) {
-		return i18n.baseText('expressionModalInput.pairedItemError');
+		return nodeHasRunData
+			? i18n.baseText('expressionModalInput.pairedItemError')
+			: i18n.baseText('expressionModalInput.pairedItemError.noRunData');
 	}
 
 	return error.message;
 };
 
-export const stringifyExpressionResult = (result: Result<unknown, Error>): string => {
+export const stringifyExpressionResult = (
+	result: Result<unknown, Error>,
+	nodeHasRunData = false,
+): string => {
 	if (!result.ok) {
 		if (getResolvableState(result.error) !== 'invalid') {
 			return '';
 		}
 
-		return `[${i18n.baseText('parameterInput.error')}: ${getExpressionErrorMessage(result.error)}]`;
+		return `[${i18n.baseText('parameterInput.error')}: ${getExpressionErrorMessage(result.error, nodeHasRunData)}]`;
 	}
 
 	if (result.result === null) {
diff --git a/packages/editor-ui/src/utils/injectStrict.test.ts b/packages/editor-ui/src/utils/injectStrict.test.ts
new file mode 100644
index 0000000000..d8051d7a96
--- /dev/null
+++ b/packages/editor-ui/src/utils/injectStrict.test.ts
@@ -0,0 +1,35 @@
+import { injectStrict } from '@/utils/injectStrict';
+import type { InjectionKey } from 'vue';
+import { inject } from 'vue';
+
+vi.mock('vue', async () => {
+	const original = await vi.importActual('vue');
+	return {
+		...original,
+		inject: vi.fn(),
+	};
+});
+
+describe('injectStrict', () => {
+	it('should return the injected value when it exists', () => {
+		const key = Symbol('testKey') as InjectionKey<string>;
+		const value = 'testValue';
+		vi.mocked(inject).mockReturnValueOnce(value);
+		const result = injectStrict(key);
+		expect(result).toBe(value);
+	});
+
+	it('should return the fallback value when the injected value does not exist', () => {
+		const key = Symbol('testKey') as InjectionKey<string>;
+		const fallback = 'fallbackValue';
+		vi.mocked(inject).mockReturnValueOnce(fallback);
+		const result = injectStrict(key, fallback);
+		expect(result).toBe(fallback);
+	});
+
+	it('should throw an error when the injected value does not exist and no fallback is provided', () => {
+		const key = Symbol('testKey') as InjectionKey<string>;
+		vi.mocked(inject).mockReturnValueOnce(undefined);
+		expect(() => injectStrict(key)).toThrowError(`Could not resolve ${key.description}`);
+	});
+});
diff --git a/packages/editor-ui/src/utils/injectStrict.ts b/packages/editor-ui/src/utils/injectStrict.ts
new file mode 100644
index 0000000000..d232927840
--- /dev/null
+++ b/packages/editor-ui/src/utils/injectStrict.ts
@@ -0,0 +1,10 @@
+import type { InjectionKey } from 'vue';
+import { inject } from 'vue';
+
+export function injectStrict<T>(key: InjectionKey<T>, fallback?: T) {
+	const resolved = inject(key, fallback);
+	if (!resolved) {
+		throw new Error(`Could not resolve ${key.description}`);
+	}
+	return resolved;
+}
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index b60a1486a7..cc8bbf13ed 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -185,6 +185,7 @@ const {
 	fetchWorkflowDataFromUrl,
 	resetWorkspace,
 	initializeWorkspace,
+	openExecution,
 	editableWorkflow,
 	editableWorkflowObject,
 	lastClickPosition,
@@ -1051,30 +1052,18 @@ function trackRunWorkflowToNode(node: INodeUi) {
 	void externalHooks.run('nodeView.onRunNode', telemetryPayload);
 }
 
-async function openExecution(executionId: string) {
+async function onOpenExecution(executionId: string) {
 	canvasStore.startLoading();
+
 	resetWorkspace();
-
-	let data: IExecutionResponse | undefined;
-	try {
-		data = await workflowsStore.getExecution(executionId);
-	} catch (error) {
-		toast.showError(error, i18n.baseText('nodeView.showError.openExecution.title'));
-		return;
-	}
-	if (data === undefined) {
-		throw new Error(`Execution with id "${executionId}" could not be found!`);
-	}
-
 	await initializeData();
 
-	initializeWorkspace(data.workflowData);
+	const data = await openExecution(executionId);
+	if (!data) {
+		return;
+	}
 
-	workflowsStore.setWorkflowExecutionData(data);
-
-	uiStore.stateIsDirty = false;
 	canvasStore.stopLoading();
-
 	fitView();
 
 	canvasEventBus.emit('open:execution', data);
@@ -1320,7 +1309,7 @@ async function onPostMessageReceived(messageEvent: MessageEvent) {
 				// so everything it needs has to be sent using post messages and passed down to child components
 				isProductionExecutionPreview.value = json.executionMode !== 'manual';
 
-				await openExecution(json.executionId);
+				await onOpenExecution(json.executionId);
 				canOpenNDV.value = json.canOpenNDV ?? true;
 				hideNodeIssues.value = json.hideNodeIssues ?? false;
 				isExecutionPreview.value = true;
@@ -1627,7 +1616,8 @@ onBeforeUnmount(() => {
 			/>
 			<CanvasChatButton
 				v-if="containsChatTriggerNodes"
-				:outline="isChatOpen === false"
+				:type="isChatOpen ? 'tertiary' : 'primary'"
+				:label="isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.window.title')"
 				@click="onOpenChat"
 			/>
 			<CanvasStopCurrentExecutionButton
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 04f338b115..72347a5d4e 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -1829,7 +1829,7 @@ export default defineComponent({
 						return;
 					}
 				} else {
-					// Pasted data is is possible workflow data
+					// Pasted data is possible workflow data
 					try {
 						// Check first if it is valid JSON
 						workflowData = JSON.parse(plainTextData);
@@ -4626,11 +4626,10 @@ export default defineComponent({
 
 				<n8n-button
 					v-if="containsChatNodes"
-					label="Chat"
+					:label="isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.window.title')"
 					size="large"
 					icon="comment"
-					type="primary"
-					:outline="isChatOpen === false"
+					:type="isChatOpen ? 'tertiary' : 'primary'"
 					data-test-id="workflow-chat-button"
 					@click.stop="onOpenChat"
 				/>
diff --git a/packages/editor-ui/src/views/NodeViewSwitcher.vue b/packages/editor-ui/src/views/NodeViewSwitcher.vue
index d40f92e626..d68d29b0b6 100644
--- a/packages/editor-ui/src/views/NodeViewSwitcher.vue
+++ b/packages/editor-ui/src/views/NodeViewSwitcher.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
+import { computed, onMounted, watch } from 'vue';
 import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router';
 import NodeViewV1 from '@/views/NodeView.vue';
 import NodeViewV2 from '@/views/NodeView.v2.vue';
@@ -17,7 +17,7 @@ const router = useRouter();
 const route = useRoute();
 const workflowHelpers = useWorkflowHelpers({ router });
 
-const { nodeViewVersion } = useNodeViewVersionSwitcher();
+const { nodeViewVersion, migrateToNewNodeViewVersion } = useNodeViewVersionSwitcher();
 
 const workflowId = computed<string>(() => route.params.name as string);
 
@@ -25,6 +25,10 @@ const isReadOnlyEnvironment = computed(() => {
 	return sourceControlStore.preferences.branchReadOnly;
 });
 
+onMounted(() => {
+	migrateToNewNodeViewVersion();
+});
+
 watch(nodeViewVersion, () => {
 	router.go(0);
 });
diff --git a/packages/editor-ui/src/views/ProjectSettings.vue b/packages/editor-ui/src/views/ProjectSettings.vue
index 971fac96a6..70d4232f32 100644
--- a/packages/editor-ui/src/views/ProjectSettings.vue
+++ b/packages/editor-ui/src/views/ProjectSettings.vue
@@ -399,7 +399,7 @@ onMounted(() => {
 
 	form {
 		width: 100%;
-		max-width: 1280px;
+		max-width: var(--content-container-width);
 		padding: 0 var(--spacing-2xl);
 
 		fieldset {
@@ -416,7 +416,7 @@ onMounted(() => {
 
 .header {
 	width: 100%;
-	max-width: 1280px;
+	max-width: var(--content-container-width);
 	padding: var(--spacing-l) var(--spacing-2xl) 0;
 }
 
diff --git a/packages/editor-ui/src/views/TemplatesView.vue b/packages/editor-ui/src/views/TemplatesView.vue
index d38107f51f..5f570eab92 100644
--- a/packages/editor-ui/src/views/TemplatesView.vue
+++ b/packages/editor-ui/src/views/TemplatesView.vue
@@ -30,7 +30,7 @@ withDefaults(defineProps<Props>(), {
 .template {
 	display: flex;
 	width: 100%;
-	max-width: 1280px;
+	max-width: var(--content-container-width);
 	padding: var(--spacing-l) var(--spacing-l) 0;
 	justify-content: center;
 	@media (min-width: 1200px) {
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
new file mode 100644
index 0000000000..e17c164472
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
@@ -0,0 +1,270 @@
+<script setup lang="ts">
+import { computed, onMounted, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { VIEWS } from '@/constants';
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import { useAnnotationTagsStore } from '@/stores/tags.store';
+import { useDebounce } from '@/composables/useDebounce';
+import { useTestDefinitionForm } from '@/components/TestDefinition/composables/useTestDefinitionForm';
+
+import EvaluationHeader from '@/components/TestDefinition/EditDefinition/EvaluationHeader.vue';
+import DescriptionInput from '@/components/TestDefinition/EditDefinition/DescriptionInput.vue';
+import EvaluationStep from '@/components/TestDefinition/EditDefinition/EvaluationStep.vue';
+import TagsInput from '@/components/TestDefinition/EditDefinition/TagsInput.vue';
+import WorkflowSelector from '@/components/TestDefinition/EditDefinition/WorkflowSelector.vue';
+import MetricsInput from '@/components/TestDefinition/EditDefinition/MetricsInput.vue';
+
+const props = defineProps<{
+	testId?: string;
+}>();
+
+const router = useRouter();
+const route = useRoute();
+const locale = useI18n();
+const { debounce } = useDebounce();
+const toast = useToast();
+const { isLoading, allTags, tagsById, fetchAll } = useAnnotationTagsStore();
+
+const testId = computed(() => props.testId ?? (route.params.testId as string));
+const currentWorkflowId = computed(() => route.params.name as string);
+const buttonLabel = computed(() =>
+	testId.value
+		? locale.baseText('testDefinition.edit.updateTest')
+		: locale.baseText('testDefinition.edit.saveTest'),
+);
+
+const {
+	state,
+	fieldsIssues,
+	isSaving,
+	loadTestData,
+	createTest,
+	updateTest,
+	startEditing,
+	saveChanges,
+	cancelEditing,
+	handleKeydown,
+} = useTestDefinitionForm();
+
+onMounted(async () => {
+	await fetchAll();
+	if (testId.value) {
+		await loadTestData(testId.value);
+	} else {
+		await onSaveTest();
+	}
+});
+
+async function onSaveTest() {
+	try {
+		let savedTest;
+		if (testId.value) {
+			savedTest = await updateTest(testId.value);
+		} else {
+			savedTest = await createTest(currentWorkflowId.value);
+		}
+		if (savedTest && route.name === VIEWS.TEST_DEFINITION_EDIT) {
+			await router.replace({
+				name: VIEWS.TEST_DEFINITION_EDIT,
+				params: { testId: savedTest.id },
+			});
+		}
+		toast.showMessage({
+			title: locale.baseText('testDefinition.edit.testSaved'),
+			type: 'success',
+		});
+	} catch (e: unknown) {
+		toast.showError(e, locale.baseText('testDefinition.edit.testSaveFailed'));
+	}
+}
+
+function hasIssues(key: string) {
+	return fieldsIssues.value.some((issue) => issue.field === key);
+}
+
+watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: true });
+</script>
+
+<template>
+	<div :class="$style.container">
+		<div :class="$style.content">
+			<EvaluationHeader
+				v-model="state.name"
+				:class="{ 'has-issues': hasIssues('name') }"
+				:start-editing="startEditing"
+				:save-changes="saveChanges"
+				:handle-keydown="handleKeydown"
+			/>
+
+			<EvaluationStep
+				:class="$style.step"
+				:title="locale.baseText('testDefinition.edit.description')"
+				:expanded="false"
+			>
+				<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
+				<template #cardContent>
+					<DescriptionInput v-model="state.description" />
+				</template>
+			</EvaluationStep>
+
+			<div :class="$style.panelIntro">{{ locale.baseText('testDefinition.edit.step.intro') }}</div>
+			<BlockArrow :class="$style.introArrow" />
+			<div :class="$style.panelBlock">
+				<EvaluationStep
+					:class="$style.step"
+					:title="locale.baseText('testDefinition.edit.step.executions')"
+				>
+					<template #icon><font-awesome-icon icon="history" size="lg" /></template>
+					<template #cardContent>
+						<TagsInput
+							v-model="state.tags"
+							:class="{ 'has-issues': hasIssues('tags') }"
+							:all-tags="allTags"
+							:tags-by-id="tagsById"
+							:is-loading="isLoading"
+							:start-editing="startEditing"
+							:save-changes="saveChanges"
+							:cancel-editing="cancelEditing"
+						/>
+					</template>
+				</EvaluationStep>
+				<div :class="$style.evaluationArrows">
+					<BlockArrow />
+					<BlockArrow />
+				</div>
+				<EvaluationStep
+					:class="$style.step"
+					:title="locale.baseText('testDefinition.edit.step.nodes')"
+					:small="true"
+					:expanded="false"
+				>
+					<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
+					<template #cardContent>{{
+						locale.baseText('testDefinition.edit.step.mockedNodes', { adjustToNumber: 0 })
+					}}</template>
+				</EvaluationStep>
+
+				<EvaluationStep
+					:class="$style.step"
+					:title="locale.baseText('testDefinition.edit.step.reRunExecutions')"
+					:small="true"
+				>
+					<template #icon><font-awesome-icon icon="redo" size="lg" /></template>
+				</EvaluationStep>
+
+				<EvaluationStep
+					:class="$style.step"
+					:title="locale.baseText('testDefinition.edit.step.compareExecutions')"
+				>
+					<template #icon><font-awesome-icon icon="equals" size="lg" /></template>
+					<template #cardContent>
+						<WorkflowSelector
+							v-model="state.evaluationWorkflow"
+							:class="{ 'has-issues': hasIssues('evaluationWorkflow') }"
+						/>
+					</template>
+				</EvaluationStep>
+
+				<EvaluationStep
+					:class="$style.step"
+					:title="locale.baseText('testDefinition.edit.step.metrics')"
+				>
+					<template #icon><font-awesome-icon icon="chart-bar" size="lg" /></template>
+					<template #cardContent>
+						<MetricsInput v-model="state.metrics" :class="{ 'has-issues': hasIssues('metrics') }" />
+					</template>
+				</EvaluationStep>
+			</div>
+
+			<div :class="$style.footer">
+				<n8n-button
+					type="primary"
+					data-test-id="run-test-button"
+					:label="buttonLabel"
+					:loading="isSaving"
+					@click="onSaveTest"
+				/>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	width: 100%;
+	height: 100%;
+	padding: var(--spacing-s);
+	display: grid;
+	grid-template-columns: minmax(auto, 24rem) 1fr;
+	gap: var(--spacing-2xl);
+}
+
+.content {
+	min-width: 0;
+	width: 100%;
+}
+
+.panelBlock {
+	max-width: var(--evaluation-edit-panel-width, 24rem);
+	display: grid;
+
+	justify-items: end;
+}
+.panelIntro {
+	font-size: var(--font-size-m);
+	color: var(--color-text-dark);
+	margin-top: var(--spacing-s);
+	justify-self: center;
+	position: relative;
+	display: block;
+}
+.step {
+	position: relative;
+
+	&:not(:first-child) {
+		margin-top: var(--spacing-m);
+	}
+}
+.introArrow {
+	--arrow-height: 1.5rem;
+	justify-self: center;
+}
+.evaluationArrows {
+	--arrow-height: 11rem;
+	display: flex;
+	justify-content: space-between;
+	width: 100%;
+	max-width: 80%;
+	margin: 0 auto;
+	margin-bottom: -100%;
+	z-index: 0;
+}
+.footer {
+	margin-top: var(--spacing-xl);
+	display: flex;
+	justify-content: flex-start;
+}
+
+.workflow {
+	padding: var(--spacing-l);
+	background-color: var(--color-background-light);
+	border-radius: var(--border-radius-large);
+	border: var(--border-base);
+}
+
+.workflowSteps {
+	display: grid;
+	gap: var(--spacing-2xs);
+	max-width: 42rem;
+	margin: 0 auto;
+}
+
+.sideBySide {
+	display: grid;
+	grid-template-columns: 1fr auto 1fr;
+	gap: var(--spacing-2xs);
+	justify-items: end;
+	align-items: start;
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
new file mode 100644
index 0000000000..33a966b4b7
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
@@ -0,0 +1,153 @@
+<script setup lang="ts">
+import { ref, computed, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { VIEWS } from '@/constants';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import EmptyState from '@/components/TestDefinition/ListDefinition/EmptyState.vue';
+import TestsList from '@/components/TestDefinition/ListDefinition/TestsList.vue';
+import type { TestExecution, TestListItem } from '@/components/TestDefinition/types';
+import { useAnnotationTagsStore } from '@/stores/tags.store';
+import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+
+const router = useRouter();
+const tagsStore = useAnnotationTagsStore();
+const testDefinitionStore = useTestDefinitionStore();
+const isLoading = ref(false);
+const toast = useToast();
+const locale = useI18n();
+
+const tests = computed<TestListItem[]>(() => {
+	return testDefinitionStore.allTestDefinitions
+		.filter((test): test is TestDefinitionRecord => test.id !== undefined)
+		.sort((a, b) => new Date(b?.updatedAt ?? '').getTime() - new Date(a?.updatedAt ?? '').getTime())
+		.map((test) => ({
+			id: test.id,
+			name: test.name ?? '',
+			tagName: test.annotationTagId ? getTagName(test.annotationTagId) : '',
+			testCases: 0, // TODO: This should come from the API
+			execution: getTestExecution(test.id),
+		}));
+});
+const hasTests = computed(() => tests.value.length > 0);
+const allTags = computed(() => tagsStore.allTags);
+
+function getTagName(tagId: string) {
+	const matchingTag = allTags.value.find((t) => t.id === tagId);
+
+	return matchingTag?.name ?? '';
+}
+
+// TODO: Replace with actual API call once implemented
+function getTestExecution(_testId: string): TestExecution {
+	const mockExecutions = {
+		lastRun: 'an hour ago',
+		errorRate: 0,
+		metrics: { metric1: 0.12, metric2: 0.99, metric3: 0.87 },
+	};
+
+	return (
+		mockExecutions || {
+			lastRun: null,
+			errorRate: null,
+			metrics: { metric1: null, metric2: null, metric3: null },
+		}
+	);
+}
+
+// Action handlers
+function onCreateTest() {
+	void router.push({ name: VIEWS.NEW_TEST_DEFINITION });
+}
+
+function onRunTest(_testId: string) {
+	// TODO: Implement test run logic
+	toast.showMessage({
+		title: locale.baseText('testDefinition.notImplemented'),
+		type: 'warning',
+	});
+}
+
+function onViewDetails(_testId: string) {
+	// TODO: Implement test details view
+	toast.showMessage({
+		title: locale.baseText('testDefinition.notImplemented'),
+		type: 'warning',
+	});
+}
+
+function onEditTest(testId: number) {
+	void router.push({ name: VIEWS.TEST_DEFINITION_EDIT, params: { testId } });
+}
+
+async function onDeleteTest(testId: string) {
+	await testDefinitionStore.deleteById(testId);
+
+	toast.showMessage({
+		title: locale.baseText('testDefinition.list.testDeleted'),
+		type: 'success',
+	});
+}
+
+// Load initial data
+async function loadInitialData() {
+	isLoading.value = true;
+	try {
+		await tagsStore.fetchAll();
+		await testDefinitionStore.fetchAll();
+	} finally {
+		isLoading.value = false;
+	}
+}
+
+onMounted(() => {
+	if (!testDefinitionStore.isFeatureEnabled) {
+		toast.showMessage({
+			title: locale.baseText('testDefinition.notImplemented'),
+			type: 'warning',
+		});
+
+		void router.push({
+			name: VIEWS.WORKFLOW,
+			params: { name: router.currentRoute.value.params.name },
+		});
+	}
+	void loadInitialData();
+});
+</script>
+
+<template>
+	<div :class="$style.container">
+		<div v-if="isLoading" :class="$style.loading">
+			<n8n-loading :loading="true" :rows="3" />
+		</div>
+
+		<template v-else>
+			<EmptyState v-if="!hasTests" @create-test="onCreateTest" />
+			<TestsList
+				v-else
+				:tests="tests"
+				@create-test="onCreateTest"
+				@run-test="onRunTest"
+				@view-details="onViewDetails"
+				@edit-test="onEditTest"
+				@delete-test="onDeleteTest"
+			/>
+		</template>
+	</div>
+</template>
+<style module lang="scss">
+.container {
+	padding: var(--spacing-xl) var(--spacing-l);
+	height: 100%;
+	width: 100%;
+	max-width: var(--content-container-width);
+}
+.loading {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 200px;
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
new file mode 100644
index 0000000000..9aeb70679b
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
@@ -0,0 +1,208 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import TestDefinitionEditView from '@/views/TestDefinition/TestDefinitionEditView.vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useToast } from '@/composables/useToast';
+import { useTestDefinitionForm } from '@/components/TestDefinition/composables/useTestDefinitionForm';
+import { useAnnotationTagsStore } from '@/stores/tags.store';
+import { ref, nextTick } from 'vue';
+
+vi.mock('vue-router');
+vi.mock('@/composables/useToast');
+vi.mock('@/components/TestDefinition/composables/useTestDefinitionForm');
+vi.mock('@/stores/tags.store');
+vi.mock('@/stores/projects.store');
+
+describe('TestDefinitionEditView', () => {
+	const renderComponent = createComponentRenderer(TestDefinitionEditView);
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			path: '/test-path',
+			name: 'test-route',
+		} as ReturnType<typeof useRoute>);
+
+		vi.mocked(useRouter).mockReturnValue({
+			push: vi.fn(),
+			resolve: vi.fn().mockReturnValue({ href: '/test-href' }),
+		} as unknown as ReturnType<typeof useRouter>);
+
+		vi.mocked(useToast).mockReturnValue({
+			showMessage: vi.fn(),
+			showError: vi.fn(),
+		} as unknown as ReturnType<typeof useToast>);
+		vi.mocked(useTestDefinitionForm).mockReturnValue({
+			state: ref({
+				name: { value: '', isEditing: false, tempValue: '' },
+				description: '',
+				tags: { appliedTagIds: [], isEditing: false },
+				evaluationWorkflow: { id: '1', name: 'Test Workflow' },
+				metrics: [],
+			}),
+			fieldsIssues: ref([]),
+			isSaving: ref(false),
+			loadTestData: vi.fn(),
+			saveTest: vi.fn(),
+			startEditing: vi.fn(),
+			saveChanges: vi.fn(),
+			cancelEditing: vi.fn(),
+			handleKeydown: vi.fn(),
+		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+		vi.mocked(useAnnotationTagsStore).mockReturnValue({
+			isLoading: ref(false),
+			allTags: ref([]),
+			tagsById: ref({}),
+			fetchAll: vi.fn(),
+		} as unknown as ReturnType<typeof useAnnotationTagsStore>);
+
+		vi.mock('@/stores/projects.store', () => ({
+			useProjectsStore: vi.fn().mockReturnValue({
+				isTeamProjectFeatureEnabled: false,
+				currentProject: null,
+				currentProjectId: null,
+			}),
+		}));
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should load test data when testId is provided', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: { testId: '1' },
+			path: '/test-path',
+			name: 'test-route',
+		} as unknown as ReturnType<typeof useRoute>);
+		const loadTestDataMock = vi.fn();
+		vi.mocked(useTestDefinitionForm).mockReturnValue({
+			...vi.mocked(useTestDefinitionForm)(),
+			loadTestData: loadTestDataMock,
+		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+
+		renderComponent({
+			pinia: createTestingPinia(),
+		});
+
+		await nextTick();
+		expect(loadTestDataMock).toHaveBeenCalledWith('1');
+	});
+
+	it('should not load test data when testId is not provided', async () => {
+		const loadTestDataMock = vi.fn();
+		vi.mocked(useTestDefinitionForm).mockReturnValue({
+			...vi.mocked(useTestDefinitionForm)(),
+			loadTestData: loadTestDataMock,
+		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+
+		renderComponent({
+			pinia: createTestingPinia(),
+		});
+
+		await nextTick();
+		expect(loadTestDataMock).not.toHaveBeenCalled();
+	});
+
+	it('should save test and show success message on successful save', async () => {
+		const saveTestMock = vi.fn().mockResolvedValue({});
+		const routerPushMock = vi.fn();
+		const routerResolveMock = vi.fn().mockReturnValue({ href: '/test-href' });
+		vi.mocked(useTestDefinitionForm).mockReturnValue({
+			...vi.mocked(useTestDefinitionForm)(),
+			createTest: saveTestMock,
+		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+
+		vi.mocked(useRouter).mockReturnValue({
+			push: routerPushMock,
+			resolve: routerResolveMock,
+		} as unknown as ReturnType<typeof useRouter>);
+
+		const { getByTestId } = renderComponent({
+			pinia: createTestingPinia(),
+		});
+		await nextTick();
+		const saveButton = getByTestId('run-test-button');
+		saveButton.click();
+		await nextTick();
+
+		expect(saveTestMock).toHaveBeenCalled();
+	});
+
+	it('should show error message on failed save', async () => {
+		const saveTestMock = vi.fn().mockRejectedValue(new Error('Save failed'));
+		const showErrorMock = vi.fn();
+		vi.mocked(useTestDefinitionForm).mockReturnValue({
+			...vi.mocked(useTestDefinitionForm)(),
+			createTest: saveTestMock,
+		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+		vi.mocked(useToast).mockReturnValue({ showError: showErrorMock } as unknown as ReturnType<
+			typeof useToast
+		>);
+
+		const { getByTestId } = renderComponent({
+			pinia: createTestingPinia(),
+		});
+		await nextTick();
+		const saveButton = getByTestId('run-test-button');
+		saveButton.click();
+		await nextTick();
+		expect(saveTestMock).toHaveBeenCalled();
+		expect(showErrorMock).toHaveBeenCalled();
+	});
+
+	it('should display "Update Test" button when editing existing test', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: { testId: '1' },
+			path: '/test-path',
+			name: 'test-route',
+		} as unknown as ReturnType<typeof useRoute>);
+		const { getByTestId } = renderComponent({
+			pinia: createTestingPinia(),
+		});
+		await nextTick();
+		const updateButton = getByTestId('run-test-button');
+		expect(updateButton.textContent).toContain('Update test');
+	});
+
+	it('should display "Run Test" button when creating new test', async () => {
+		const { getByTestId } = renderComponent({
+			pinia: createTestingPinia(),
+		});
+		await nextTick();
+		const saveButton = getByTestId('run-test-button');
+		expect(saveButton).toBeTruthy();
+	});
+
+	it('should apply "has-issues" class to inputs with issues', async () => {
+		vi.mocked(useTestDefinitionForm).mockReturnValue({
+			...vi.mocked(useTestDefinitionForm)(),
+			fieldsIssues: ref([{ field: 'name' }, { field: 'tags' }]),
+		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+
+		const { container } = renderComponent({
+			pinia: createTestingPinia(),
+		});
+		await nextTick();
+		expect(container.querySelector('.has-issues')).toBeTruthy();
+	});
+
+	it('should fetch all tags on mount', async () => {
+		const fetchAllMock = vi.fn();
+		vi.mocked(useAnnotationTagsStore).mockReturnValue({
+			...vi.mocked(useAnnotationTagsStore)(),
+			fetchAll: fetchAllMock,
+		} as unknown as ReturnType<typeof useAnnotationTagsStore>);
+
+		renderComponent({
+			pinia: createTestingPinia(),
+		});
+
+		await nextTick();
+		expect(fetchAllMock).toHaveBeenCalled();
+	});
+});
diff --git a/packages/editor-ui/src/vue-virtual-scroller.d.ts b/packages/editor-ui/src/vue-virtual-scroller.d.ts
new file mode 100644
index 0000000000..1e6ef322aa
--- /dev/null
+++ b/packages/editor-ui/src/vue-virtual-scroller.d.ts
@@ -0,0 +1,112 @@
+declare module 'vue-virtual-scroller' {
+	import {
+		type ObjectEmitsOptions,
+		type PublicProps,
+		type SetupContext,
+		type SlotsType,
+		type VNode,
+	} from 'vue';
+
+	interface RecycleScrollerProps<T> {
+		items: readonly T[];
+		direction?: 'vertical' | 'horizontal';
+		itemSize?: number | null;
+		gridItems?: number;
+		itemSecondarySize?: number;
+		minItemSize?: number;
+		sizeField?: string;
+		typeField?: string;
+		keyField?: keyof T;
+		pageMode?: boolean;
+		prerender?: number;
+		buffer?: number;
+		emitUpdate?: boolean;
+		updateInterval?: number;
+		listClass?: string;
+		itemClass?: string;
+		listTag?: string;
+		itemTag?: string;
+	}
+
+	interface DynamicScrollerProps<T> extends RecycleScrollerProps<T> {
+		minItemSize: number;
+	}
+
+	interface RecycleScrollerEmitOptions extends ObjectEmitsOptions {
+		resize: () => void;
+		visible: () => void;
+		hidden: () => void;
+		update: (
+			startIndex: number,
+			endIndex: number,
+			visibleStartIndex: number,
+			visibleEndIndex: number,
+		) => void;
+		'scroll-start': () => void;
+		'scroll-end': () => void;
+	}
+
+	interface RecycleScrollerSlotProps<T> {
+		item: T;
+		index: number;
+		active: boolean;
+	}
+
+	interface RecycleScrollerSlots<T> {
+		default(slotProps: RecycleScrollerSlotProps<T>): unknown;
+		before(): unknown;
+		empty(): unknown;
+		after(): unknown;
+	}
+
+	export interface RecycleScrollerInstance {
+		getScroll(): { start: number; end: number };
+		scrollToItem(index: number): void;
+		scrollToPosition(position: number): void;
+	}
+
+	export const RecycleScroller: <T>(
+		props: RecycleScrollerProps<T> & PublicProps,
+		ctx?: SetupContext<RecycleScrollerEmitOptions, SlotsType<RecycleScrollerSlots<T>>>,
+		expose?: (exposed: RecycleScrollerInstance) => void,
+	) => VNode & {
+		__ctx?: {
+			props: RecycleScrollerProps<T> & PublicProps;
+			expose(exposed: RecycleScrollerInstance): void;
+			slots: RecycleScrollerSlots<T>;
+		};
+	};
+
+	export const DynamicScroller: <T>(
+		props: DynamicScrollerProps<T> & PublicProps,
+		ctx?: SetupContext<RecycleScrollerEmitOptions, SlotsType<RecycleScrollerSlots<T>>>,
+		expose?: (exposed: RecycleScrollerInstance) => void,
+	) => VNode & {
+		__ctx?: {
+			props: DynamicScrollerProps<T> & PublicProps;
+			expose(exposed: RecycleScrollerInstance): void;
+			slots: RecycleScrollerSlots<T>;
+		};
+	};
+
+	interface DynamicScrollerItemProps<T> {
+		item: T;
+		active: boolean;
+		sizeDependencies?: unknown[];
+		watchData?: boolean;
+		tag?: string;
+		emitResize?: boolean;
+		onResize?: () => void;
+	}
+
+	interface DynamicScrollerItemEmitOptions extends ObjectEmitsOptions {
+		resize: () => void;
+	}
+
+	export const DynamicScrollerItem: <T>(
+		props: DynamicScrollerItemProps<T> & PublicProps,
+		ctx?: SetupContext<DynamicScrollerItemEmitOptions>,
+	) => VNode;
+
+	export function IdState(options?: { idProp?: (value: any) => unknown }): unknown;
+}
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 37a0c88f27..aa4088cf45 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.68.0",
+  "version": "1.70.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/Aws.credentials.ts b/packages/nodes-base/credentials/Aws.credentials.ts
index 9170657a4f..bb7b30d4cf 100644
--- a/packages/nodes-base/credentials/Aws.credentials.ts
+++ b/packages/nodes-base/credentials/Aws.credentials.ts
@@ -330,7 +330,7 @@ export class Aws implements ICredentialType {
 						endpoint.searchParams.set('Version', '2011-06-15');
 					}
 				} catch (err) {
-					console.log(err);
+					console.error(err);
 				}
 			}
 			const parsed = parseAwsUrl(endpoint);
@@ -372,7 +372,7 @@ export class Aws implements ICredentialType {
 						customUrl.searchParams.set('Action', 'GetCallerIdentity');
 						customUrl.searchParams.set('Version', '2011-06-15');
 					} catch (err) {
-						console.log(err);
+						console.error(err);
 					}
 				}
 				endpoint = customUrl;
@@ -411,7 +411,7 @@ export class Aws implements ICredentialType {
 		try {
 			sign(signOpts, securityHeaders);
 		} catch (err) {
-			console.log(err);
+			console.error(err);
 		}
 		const options: IHttpRequestOptions = {
 			...requestOptions,
diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
index 9a6b77efb9..5ee8432f54 100644
--- a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
@@ -18,8 +18,9 @@ export class MicrosoftOAuth2Api implements ICredentialType {
 			type: 'hidden',
 			default: 'authorizationCode',
 		},
-		//info about the tenantID
-		//https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-protocols#endpoints
+		// Info about the tenantID
+		// https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-v2-protocols#endpoints
+		// Endpoints `/common` can only be used for multitenant apps
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
diff --git a/packages/nodes-base/credentials/MicrosoftSharePointOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftSharePointOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..d8243627f5
--- /dev/null
+++ b/packages/nodes-base/credentials/MicrosoftSharePointOAuth2Api.credentials.ts
@@ -0,0 +1,38 @@
+import type { Icon, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class MicrosoftSharePointOAuth2Api implements ICredentialType {
+	name = 'microsoftSharePointOAuth2Api';
+
+	extends = ['microsoftOAuth2Api'];
+
+	icon: Icon = {
+		light: 'file:icons/SharePoint.svg',
+		dark: 'file:icons/SharePoint.svg',
+	};
+
+	displayName = 'Microsoft SharePoint OAuth2 API';
+
+	documentationUrl = 'microsoft';
+
+	httpRequestNode = {
+		name: 'Microsoft SharePoint',
+		docsUrl: 'https://learn.microsoft.com/en-us/sharepoint/dev/apis/sharepoint-rest-graph',
+		apiBaseUrlPlaceholder: 'https://{subdomain}.sharepoint.com/_api/v2.0/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: '=openid offline_access https://{{$self.subdomain}}.sharepoint.com/.default',
+		},
+		{
+			displayName: 'Subdomain',
+			name: 'subdomain',
+			type: 'string',
+			default: '',
+			hint: 'You can extract the subdomain from the URL. For example, in the URL "https://tenant123.sharepoint.com", the subdomain is "tenant123".',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/ZabbixApi.credentials.ts b/packages/nodes-base/credentials/ZabbixApi.credentials.ts
new file mode 100644
index 0000000000..1c081b30da
--- /dev/null
+++ b/packages/nodes-base/credentials/ZabbixApi.credentials.ts
@@ -0,0 +1,78 @@
+import type {
+	IAuthenticateGeneric,
+	Icon,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class ZabbixApi implements ICredentialType {
+	name = 'zabbixApi';
+
+	displayName = 'Zabbix API';
+
+	documentationUrl = 'zabbix';
+
+	icon: Icon = 'file:icons/Zabbix.svg';
+
+	httpRequestNode = {
+		name: 'Zabbix',
+		docsUrl: 'https://www.zabbix.com/documentation/current/en/manual/api',
+		apiBaseUrl: '',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			required: true,
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'API Token',
+			name: 'apiToken',
+			required: true,
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiToken}}',
+				'Content-Type': 'application/json-rpc',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}'.replace(/\/$/, ''),
+			url: '/api_jsonrpc.php',
+			method: 'POST',
+			body: {
+				jsonrpc: '2.0',
+				method: 'host.get',
+				params: {
+					output: ['hostid', 'host'],
+					selectInterfaces: ['interfaceid', 'ip'],
+				},
+				id: 2,
+			},
+		},
+		rules: [
+			{
+				type: 'responseSuccessBody',
+				properties: {
+					key: 'result',
+					value: undefined,
+					message: 'Invalid access token',
+				},
+			},
+		],
+	};
+}
diff --git a/packages/nodes-base/credentials/icons/SharePoint.svg b/packages/nodes-base/credentials/icons/SharePoint.svg
new file mode 100644
index 0000000000..8baca49105
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/SharePoint.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Livello_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1992.333 1946"
+	 enable-background="new 0 0 1992.333 1946" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  bottomLeftOrigin="true" height="1946" width="1992.333" x="-995.333" y="-949"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<circle fill="#036C70" cx="1019.333" cy="556" r="556"/>
+<circle fill="#1A9BA1" cx="1482.667" cy="1065.667" r="509.667"/>
+<circle fill="#37C6D0" cx="1088.833" cy="1552.167" r="393.833"/>
+<path opacity="0.1" enable-background="new    " d="M1112,501.79v988.753c-0.23,34.357-21.05,65.222-52.82,78.303
+	c-10.116,4.279-20.987,6.484-31.97,6.487H695.463c-0.463-7.877-0.463-15.29-0.463-23.167c-0.154-7.734,0.155-15.47,0.927-23.167
+	c8.48-148.106,99.721-278.782,235.837-337.77v-86.18c-302.932-48.005-509.592-332.495-461.587-635.427
+	c0.333-2.098,0.677-4.195,1.034-6.289c2.306-15.626,5.556-31.099,9.73-46.333h546.27C1073.964,417.178,1111.822,455.036,1112,501.79
+	z"/>
+<path opacity="0.2" enable-background="new    " d="M980.877,463.333H471.21c-51.486,302.386,151.908,589.256,454.293,640.742
+	c9.156,1.559,18.35,2.888,27.573,3.986c-143.633,68.11-248.3,261.552-257.196,420.938c-0.771,7.697-1.081,15.433-0.927,23.167
+	c0,7.877,0,15.29,0.463,23.167c0.836,15.574,2.85,31.063,6.023,46.333h279.39c34.357-0.23,65.222-21.05,78.303-52.82
+	c4.279-10.115,6.485-20.987,6.487-31.97V548.123C1065.443,501.387,1027.613,463.537,980.877,463.333z"/>
+<path opacity="0.2" enable-background="new    " d="M980.877,463.333H471.21c-51.475,302.414,151.95,589.297,454.364,640.773
+	c6.186,1.053,12.389,2.001,18.607,2.844c-139,73.021-239.543,266-248.254,422.05h284.95c46.681-0.353,84.437-38.109,84.79-84.79
+	V548.123C1065.489,501.369,1027.631,463.511,980.877,463.333z"/>
+<path opacity="0.2" enable-background="new    " d="M934.543,463.333H471.21c-48.606,285.482,130.279,560.404,410.977,631.616
+	C775.901,1216.384,710.711,1368.301,695.927,1529h238.617c46.754-0.178,84.612-38.036,84.79-84.79V548.123
+	C1019.308,501.306,981.361,463.359,934.543,463.333z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="177.0788" y1="1551.0284" x2="842.2545" y2="398.9716" gradientTransform="matrix(1 0 0 -1 0 1948)">
+	<stop  offset="0" style="stop-color:#058F92"/>
+	<stop  offset="0.5" style="stop-color:#038489"/>
+	<stop  offset="1" style="stop-color:#026D71"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M84.929,463.333h849.475c46.905,0,84.929,38.024,84.929,84.929v849.475
+	c0,46.905-38.024,84.929-84.929,84.929H84.929c-46.905,0-84.929-38.024-84.929-84.929V548.262
+	C0,501.357,38.024,463.333,84.929,463.333z"/>
+<path fill="#FFFFFF" d="M379.331,962.621c-19.903-13.202-36.528-30.777-48.604-51.384c-11.701-21.542-17.533-45.781-16.912-70.288
+	c-1.042-33.181,10.155-65.586,31.46-91.045c22.388-25.49,51.326-44.366,83.678-54.581c36.871-12.136,75.49-18.116,114.304-17.699
+	c51.043-1.865,102.015,5.272,150.583,21.082v106.567c-21.103-12.784-44.088-22.166-68.11-27.8
+	c-26.065-6.392-52.81-9.597-79.647-9.545c-28.3-1.039-56.419,4.913-81.871,17.329c-19.65,8.475-32.392,27.807-32.433,49.206
+	c-0.08,12.981,4.907,25.481,13.9,34.843c10.622,11.037,23.187,20.021,37.067,26.503c15.444,7.691,38.611,17.916,69.5,30.673
+	c3.401,1.075,6.716,2.407,9.915,3.985c30.401,11.881,59.729,26.344,87.663,43.229c21.154,13.043,38.908,30.924,51.801,52.171
+	c13.218,24.085,19.625,51.315,18.533,78.767c1.509,34.066-8.913,67.591-29.468,94.798c-20.488,25.012-47.88,43.446-78.767,53.005
+	c-36.329,11.387-74.245,16.892-112.312,16.309c-34.154,0.155-68.258-2.635-101.933-8.34c-28.434-4.653-56.182-12.807-82.612-24.279
+	v-112.358c25.264,18.043,53.489,31.529,83.4,39.847c29.81,9.289,60.798,14.251,92.018,14.734c28.895,1.83,57.739-4.291,83.4-17.699
+	c17.976-10.144,28.909-29.358,28.449-49.994c0.12-14.359-5.56-28.158-15.753-38.271c-12.676-12.444-27.352-22.671-43.414-30.256
+	c-18.533-9.267-45.824-21.483-81.871-36.65C432.618,993.951,405.161,979.594,379.331,962.621z"/>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/Zabbix.svg b/packages/nodes-base/credentials/icons/Zabbix.svg
new file mode 100644
index 0000000000..960a3a3341
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Zabbix.svg
@@ -0,0 +1 @@
+<svg height="655" viewBox="0 0 400.83 104.99" width="2500" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h400.83v104.99h-400.83zm0 0" fill="#d40000"/><path d="m17.14 16h57.96v7.53l-46.65 57.15h47.79v8.31h-60.24v-7.53l46.65-57.15h-45.51zm98.3 9.73-13.54 36.33h27.13zm-5.64-9.73h11.32l28.12 72.99h-10.38l-6.71-18.72h-33.27l-6.72 18.72h-10.53zm60.14 38.13v26.74h16.01c5.37 0 9.35-1.1 11.94-3.3s3.88-5.57 3.88-10.09c0-4.56-1.29-7.93-3.88-10.1-2.59-2.16-6.57-3.25-11.94-3.25zm0-30.02v22h14.78c4.88 0 8.51-.91 10.9-2.71 2.39-1.81 3.58-4.57 3.58-8.28 0-3.68-1.2-6.44-3.58-8.26-2.39-1.82-6.02-2.74-10.9-2.74h-14.78zm-9.98-8.11h25.5c7.61 0 13.48 1.56 17.59 4.69 4.12 3.13 6.17 7.58 6.17 13.35 0 4.46-1.05 8.02-3.16 10.66s-5.21 4.29-9.29 4.94c4.91 1.04 8.72 3.21 11.44 6.52s4.08 7.44 4.08 12.39c0 6.52-2.24 11.55-6.72 15.11-4.48 3.55-10.86 5.33-19.12 5.33h-26.49zm78.32 38.13v26.74h16.02c5.37 0 9.35-1.1 11.93-3.3 2.59-2.2 3.88-5.57 3.88-10.09 0-4.56-1.29-7.93-3.88-10.1-2.59-2.16-6.57-3.25-11.93-3.25zm0-30.02v22h14.78c4.88 0 8.51-.91 10.9-2.71 2.39-1.81 3.58-4.57 3.58-8.28 0-3.68-1.19-6.44-3.58-8.26s-6.02-2.74-10.9-2.74h-14.78zm-9.98-8.11h25.5c7.61 0 13.48 1.56 17.59 4.69 4.12 3.13 6.18 7.58 6.18 13.35 0 4.46-1.05 8.02-3.16 10.66s-5.21 4.29-9.29 4.94c4.91 1.04 8.72 3.21 11.44 6.52s4.08 7.44 4.08 12.39c0 6.52-2.24 11.55-6.72 15.11-4.48 3.55-10.86 5.33-19.12 5.33h-26.5zm97.24 0h10.98l17.35 26.21 17.52-26.21h10.61l-22.84 34.19 25.68 38.8h-10.98l-20.21-30.54-20.41 30.54h-10.61l25.74-38.52zm-28.91 0h9.98v72.99h-9.98zm0 0" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
index bd3e677a2d..59b4618d88 100644
--- a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
@@ -121,7 +121,7 @@ export class AiTransform implements INodeType {
 			sandbox.on(
 				'output',
 				workflowMode === 'manual'
-					? this.sendMessageToUI
+					? this.sendMessageToUI.bind(this)
 					: CODE_ENABLE_STDOUT === 'true'
 						? (...args) =>
 								console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args)
diff --git a/packages/nodes-base/nodes/Code/Code.node.ts b/packages/nodes-base/nodes/Code/Code.node.ts
index 5f9b537d96..99604a712a 100644
--- a/packages/nodes-base/nodes/Code/Code.node.ts
+++ b/packages/nodes-base/nodes/Code/Code.node.ts
@@ -17,7 +17,7 @@ import { JavaScriptSandbox } from './JavaScriptSandbox';
 import { JsTaskRunnerSandbox } from './JsTaskRunnerSandbox';
 import { PythonSandbox } from './PythonSandbox';
 import { getSandboxContext } from './Sandbox';
-import { standardizeOutput } from './utils';
+import { addPostExecutionWarning, standardizeOutput } from './utils';
 
 const { CODE_ENABLE_STDOUT } = process.env;
 
@@ -111,10 +111,11 @@ export class Code implements INodeType {
 		if (runnersConfig.enabled && language === 'javaScript') {
 			const code = this.getNodeParameter(codeParameterName, 0) as string;
 			const sandbox = new JsTaskRunnerSandbox(code, nodeMode, workflowMode, this);
+			const numInputItems = this.getInputData().length;
 
 			return nodeMode === 'runOnceForAllItems'
 				? [await sandbox.runCodeAllItems()]
-				: [await sandbox.runCodeForEachItem()];
+				: [await sandbox.runCodeForEachItem(numInputItems)];
 		}
 
 		const getSandbox = (index = 0) => {
@@ -132,7 +133,7 @@ export class Code implements INodeType {
 			sandbox.on(
 				'output',
 				workflowMode === 'manual'
-					? this.sendMessageToUI
+					? this.sendMessageToUI.bind(this)
 					: CODE_ENABLE_STDOUT === 'true'
 						? (...args) =>
 								console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args)
@@ -141,6 +142,8 @@ export class Code implements INodeType {
 			return sandbox;
 		};
 
+		const inputDataItems = this.getInputData();
+
 		// ----------------------------------
 		//        runOnceForAllItems
 		// ----------------------------------
@@ -162,7 +165,7 @@ export class Code implements INodeType {
 				standardizeOutput(item.json);
 			}
 
-			return [items];
+			return addPostExecutionWarning(items, inputDataItems?.length);
 		}
 
 		// ----------------------------------
@@ -171,9 +174,7 @@ export class Code implements INodeType {
 
 		const returnData: INodeExecutionData[] = [];
 
-		const items = this.getInputData();
-
-		for (let index = 0; index < items.length; index++) {
+		for (let index = 0; index < inputDataItems.length; index++) {
 			const sandbox = getSandbox(index);
 			let result: INodeExecutionData | undefined;
 			try {
@@ -200,6 +201,6 @@ export class Code implements INodeType {
 			}
 		}
 
-		return [returnData];
+		return addPostExecutionWarning(returnData, inputDataItems?.length);
 	}
 }
diff --git a/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts b/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts
index 98d98a28e3..8a506ce40c 100644
--- a/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts
+++ b/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts
@@ -18,6 +18,7 @@ export class JsTaskRunnerSandbox {
 		private readonly nodeMode: CodeExecutionMode,
 		private readonly workflowMode: WorkflowExecuteMode,
 		private readonly executeFunctions: IExecuteFunctions,
+		private readonly chunkSize = 1000,
 	) {}
 
 	async runCodeAllItems(): Promise<INodeExecutionData[]> {
@@ -39,24 +40,37 @@ export class JsTaskRunnerSandbox {
 			: this.throwExecutionError(executionResult.error);
 	}
 
-	async runCodeForEachItem(): Promise<INodeExecutionData[]> {
+	async runCodeForEachItem(numInputItems: number): Promise<INodeExecutionData[]> {
 		validateNoDisallowedMethodsInRunForEach(this.jsCode, 0);
+
 		const itemIndex = 0;
+		const chunks = this.chunkInputItems(numInputItems);
+		let executionResults: INodeExecutionData[] = [];
 
-		const executionResult = await this.executeFunctions.startJob<INodeExecutionData[]>(
-			'javascript',
-			{
-				code: this.jsCode,
-				nodeMode: this.nodeMode,
-				workflowMode: this.workflowMode,
-				continueOnFail: this.executeFunctions.continueOnFail(),
-			},
-			itemIndex,
-		);
+		for (const chunk of chunks) {
+			const executionResult = await this.executeFunctions.startJob<INodeExecutionData[]>(
+				'javascript',
+				{
+					code: this.jsCode,
+					nodeMode: this.nodeMode,
+					workflowMode: this.workflowMode,
+					continueOnFail: this.executeFunctions.continueOnFail(),
+					chunk: {
+						startIndex: chunk.startIdx,
+						count: chunk.count,
+					},
+				},
+				itemIndex,
+			);
 
-		return executionResult.ok
-			? executionResult.result
-			: this.throwExecutionError(executionResult.error);
+			if (!executionResult.ok) {
+				return this.throwExecutionError(executionResult.error);
+			}
+
+			executionResults = executionResults.concat(executionResult.result);
+		}
+
+		return executionResults;
 	}
 
 	private throwExecutionError(error: unknown): never {
@@ -70,4 +84,22 @@ export class JsTaskRunnerSandbox {
 
 		throw new ApplicationError(`Unknown error: ${JSON.stringify(error)}`);
 	}
+
+	/** Chunks the input items into chunks of 1000 items each */
+	private chunkInputItems(numInputItems: number) {
+		const numChunks = Math.ceil(numInputItems / this.chunkSize);
+		const chunks = [];
+
+		for (let i = 0; i < numChunks; i++) {
+			const startIdx = i * this.chunkSize;
+			const isLastChunk = i === numChunks - 1;
+			const count = isLastChunk ? numInputItems - startIdx : this.chunkSize;
+			chunks.push({
+				startIdx,
+				count,
+			});
+		}
+
+		return chunks;
+	}
 }
diff --git a/packages/nodes-base/nodes/Code/Sandbox.ts b/packages/nodes-base/nodes/Code/Sandbox.ts
index 917de0ecc1..e11a078f54 100644
--- a/packages/nodes-base/nodes/Code/Sandbox.ts
+++ b/packages/nodes-base/nodes/Code/Sandbox.ts
@@ -35,8 +35,8 @@ export function getSandboxContext(
 	};
 	return {
 		// from NodeExecuteFunctions
-		$getNodeParameter: this.getNodeParameter,
-		$getWorkflowStaticData: this.getWorkflowStaticData,
+		$getNodeParameter: this.getNodeParameter.bind(this),
+		$getWorkflowStaticData: this.getWorkflowStaticData.bind(this),
 		helpers,
 
 		// to bring in all $-prefixed vars and methods from WorkflowDataProxy
diff --git a/packages/nodes-base/nodes/Code/test/Code.node.test.ts b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
index 4331b3b7e8..3f1ed0eccf 100644
--- a/packages/nodes-base/nodes/Code/test/Code.node.test.ts
+++ b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
@@ -57,7 +57,8 @@ describe('Code Node unit test', () => {
 					jest.spyOn(NodeVM.prototype, 'run').mockResolvedValueOnce(input);
 
 					const output = await node.execute.call(thisArg);
-					expect(output).toEqual([expected]);
+
+					expect([...output]).toEqual([expected]);
 				}),
 			);
 		});
@@ -109,7 +110,7 @@ describe('Code Node unit test', () => {
 					jest.spyOn(NodeVM.prototype, 'run').mockResolvedValueOnce(input);
 
 					const output = await node.execute.call(thisArg);
-					expect(output).toEqual([[{ json: expected?.json, pairedItem: { item: 0 } }]]);
+					expect([...output]).toEqual([[{ json: expected?.json, pairedItem: { item: 0 } }]]);
 				}),
 			);
 		});
diff --git a/packages/nodes-base/nodes/Code/test/JsTaskRunnerSandbox.test.ts b/packages/nodes-base/nodes/Code/test/JsTaskRunnerSandbox.test.ts
new file mode 100644
index 0000000000..00eb17544a
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/test/JsTaskRunnerSandbox.test.ts
@@ -0,0 +1,61 @@
+import { mock } from 'jest-mock-extended';
+import type { IExecuteFunctions } from 'n8n-workflow';
+import { createResultOk } from 'n8n-workflow';
+
+import { JsTaskRunnerSandbox } from '../JsTaskRunnerSandbox';
+
+describe('JsTaskRunnerSandbox', () => {
+	describe('runCodeForEachItem', () => {
+		it('should chunk the input items and execute the code for each chunk', async () => {
+			const jsCode = 'console.log($item);';
+			const nodeMode = 'runOnceForEachItem';
+			const workflowMode = 'manual';
+			const executeFunctions = mock<IExecuteFunctions>();
+			const sandbox = new JsTaskRunnerSandbox(jsCode, nodeMode, workflowMode, executeFunctions, 2);
+			let i = 1;
+			executeFunctions.startJob.mockResolvedValue(createResultOk([{ json: { item: i++ } }]));
+
+			const numInputItems = 5;
+			await sandbox.runCodeForEachItem(numInputItems);
+
+			// eslint-disable-next-line @typescript-eslint/unbound-method
+			expect(executeFunctions.startJob).toHaveBeenCalledTimes(3);
+			const calls = executeFunctions.startJob.mock.calls;
+			expect(calls).toEqual([
+				[
+					'javascript',
+					{
+						code: jsCode,
+						nodeMode,
+						workflowMode,
+						continueOnFail: executeFunctions.continueOnFail(),
+						chunk: { startIndex: 0, count: 2 },
+					},
+					0,
+				],
+				[
+					'javascript',
+					{
+						code: jsCode,
+						nodeMode,
+						workflowMode,
+						continueOnFail: executeFunctions.continueOnFail(),
+						chunk: { startIndex: 2, count: 2 },
+					},
+					0,
+				],
+				[
+					'javascript',
+					{
+						code: jsCode,
+						nodeMode,
+						workflowMode,
+						continueOnFail: executeFunctions.continueOnFail(),
+						chunk: { startIndex: 4, count: 1 },
+					},
+					0,
+				],
+			]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Code/test/utils.test.ts b/packages/nodes-base/nodes/Code/test/utils.test.ts
new file mode 100644
index 0000000000..b622c86661
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/test/utils.test.ts
@@ -0,0 +1,48 @@
+import type { INodeExecutionData } from 'n8n-workflow';
+import { NodeExecutionOutput } from 'n8n-workflow';
+import { addPostExecutionWarning } from '../utils';
+
+describe('addPostExecutionWarning', () => {
+	const inputItemsLength = 2;
+
+	it('should return a NodeExecutionOutput warning when returnData length differs from inputItemsLength', () => {
+		const returnData: INodeExecutionData[] = [{ json: {}, pairedItem: 0 }];
+
+		const result = addPostExecutionWarning(returnData, inputItemsLength);
+
+		expect(result).toBeInstanceOf(NodeExecutionOutput);
+		expect((result as NodeExecutionOutput)?.getHints()).toEqual([
+			{
+				message:
+					'To make sure expressions after this node work, return the input items that produced each output item. <a target="_blank" href="https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-code-node/">More info</a>',
+				location: 'outputPane',
+			},
+		]);
+	});
+
+	it('should return a NodeExecutionOutput warning when any item has undefined pairedItem', () => {
+		const returnData: INodeExecutionData[] = [{ json: {}, pairedItem: 0 }, { json: {} }];
+
+		const result = addPostExecutionWarning(returnData, inputItemsLength);
+
+		expect(result).toBeInstanceOf(NodeExecutionOutput);
+		expect((result as NodeExecutionOutput)?.getHints()).toEqual([
+			{
+				message:
+					'To make sure expressions after this node work, return the input items that produced each output item. <a target="_blank" href="https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-code-node/">More info</a>',
+				location: 'outputPane',
+			},
+		]);
+	});
+
+	it('should return returnData array when all items match inputItemsLength and have defined pairedItem', () => {
+		const returnData: INodeExecutionData[] = [
+			{ json: {}, pairedItem: 0 },
+			{ json: {}, pairedItem: 1 },
+		];
+
+		const result = addPostExecutionWarning(returnData, inputItemsLength);
+
+		expect(result).toEqual([returnData]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Code/utils.ts b/packages/nodes-base/nodes/Code/utils.ts
index 28fa00f829..410da572b9 100644
--- a/packages/nodes-base/nodes/Code/utils.ts
+++ b/packages/nodes-base/nodes/Code/utils.ts
@@ -1,4 +1,5 @@
-import type { IDataObject } from 'n8n-workflow';
+import type { INodeExecutionData, IDataObject } from 'n8n-workflow';
+import { NodeExecutionOutput } from 'n8n-workflow';
 
 export function isObject(maybe: unknown): maybe is { [key: string]: unknown } {
 	return (
@@ -36,3 +37,26 @@ export function standardizeOutput(output: IDataObject) {
 	standardizeOutputRecursive(output);
 	return output;
 }
+
+export const addPostExecutionWarning = (
+	returnData: INodeExecutionData[],
+	inputItemsLength: number,
+) => {
+	if (
+		returnData.length !== inputItemsLength ||
+		returnData.some((item) => item.pairedItem === undefined)
+	) {
+		return new NodeExecutionOutput(
+			[returnData],
+			[
+				{
+					message:
+						'To make sure expressions after this node work, return the input items that produced each output item. <a target="_blank" href="https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-code-node/">More info</a>',
+					location: 'outputPane',
+				},
+			],
+		);
+	}
+
+	return [returnData];
+};
diff --git a/packages/nodes-base/nodes/DebugHelper/functions.ts b/packages/nodes-base/nodes/DebugHelper/functions.ts
index a740b577b7..867ef873da 100644
--- a/packages/nodes-base/nodes/DebugHelper/functions.ts
+++ b/packages/nodes-base/nodes/DebugHelper/functions.ts
@@ -7,7 +7,7 @@ export const runGarbageCollector = () => {
 		const gc = runInNewContext('gc'); // nocommit
 		gc();
 	} catch (error) {
-		console.log(error);
+		console.error(error);
 	}
 };
 
@@ -23,8 +23,5 @@ export const generateGarbageMemory = (sizeInMB: number, onHeap = true) => {
 		const array = new Uint8Array(size);
 		array.fill(0);
 	}
-	// const used = process.memoryUsage().heapUsed / 1024 / 1024;
-	// const external = process.memoryUsage().external / 1024 / 1024;
-	// console.log(`heap: ${used} MB / external: ${external} MB`);
 	return { ...process.memoryUsage() };
 };
diff --git a/packages/nodes-base/nodes/Form/Form.node.ts b/packages/nodes-base/nodes/Form/Form.node.ts
index 1aa55daf89..3dd8d857ee 100644
--- a/packages/nodes-base/nodes/Form/Form.node.ts
+++ b/packages/nodes-base/nodes/Form/Form.node.ts
@@ -274,7 +274,9 @@ export class Form extends Node {
 			delete staticData[id];
 
 			if (config.redirectUrl) {
-				res.redirect(config.redirectUrl);
+				res.send(
+					`<html><head><meta http-equiv="refresh" content="0; url=${config.redirectUrl}"></head></html>`,
+				);
 				return { noWebhookResponse: true };
 			}
 
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index 6f2955e754..4819e27642 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -92,8 +92,8 @@ return items;`,
 
 		// Define the global objects for the custom function
 		const sandbox = {
-			getNodeParameter: this.getNodeParameter,
-			getWorkflowStaticData: this.getWorkflowStaticData,
+			getNodeParameter: this.getNodeParameter.bind(this),
+			getWorkflowStaticData: this.getWorkflowStaticData.bind(this),
 			helpers: this.helpers,
 			items,
 			// To be able to access data of other items
@@ -157,7 +157,7 @@ return items;`,
 		const vm = new NodeVM(options);
 
 		if (mode === 'manual') {
-			vm.on('console.log', this.sendMessageToUI);
+			vm.on('console.log', this.sendMessageToUI.bind(this));
 		}
 
 		// Get the code to execute
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index 9bc3be35d1..9f08f05c8e 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -113,8 +113,8 @@ return item;`,
 						}
 						item.binary = data;
 					},
-					getNodeParameter: this.getNodeParameter,
-					getWorkflowStaticData: this.getWorkflowStaticData,
+					getNodeParameter: this.getNodeParameter.bind(this),
+					getWorkflowStaticData: this.getWorkflowStaticData.bind(this),
 					helpers: this.helpers,
 					item: item.json,
 					getBinaryDataAsync: async (): Promise<IBinaryKeyData | undefined> => {
@@ -165,7 +165,7 @@ return item;`,
 				const vm = new NodeVM(options as unknown as NodeVMOptions);
 
 				if (mode === 'manual') {
-					vm.on('console.log', this.sendMessageToUI);
+					vm.on('console.log', this.sendMessageToUI.bind(this));
 				}
 
 				// Get the code to execute
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
index 3780ea05a5..b5f7980c69 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
@@ -159,7 +159,7 @@ const properties: INodeProperties[] = [
 						name: 'canShare',
 						type: 'boolean',
 						default: false,
-						description: 'Whether the current user can rename this shared drive',
+						description: 'Whether the current user can share files or folders in this shared drive',
 					},
 					{
 						displayName: 'Can Trash Children',
diff --git a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
index f6ac15258d..354a5b4f13 100644
--- a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
@@ -99,7 +99,7 @@ export async function haloPSAApiRequest(
 		if (method === 'DELETE' || method === 'GET' || (method === 'POST' && message)) {
 			let newErrorMessage;
 			if (message.includes('400')) {
-				console.log(message);
+				this.logger.debug(message);
 				newErrorMessage = JSON.parse(message.split(' - ')[1]);
 				(error as JsonObject).message = `For field ID, ${
 					newErrorMessage.id || newErrorMessage['[0].id']
@@ -136,14 +136,14 @@ export async function haloPSAApiRequest(
 // 	)) as IDataObject;
 
 // 	const { tickets } = response;
-// 	console.log((tickets as IDataObject[]).map(t => t.id));
+// 	this.logger.debug((tickets as IDataObject[]).map(t => t.id));
 // 	const body: IDataObject = {
 // 		id: clientId,
 // 		client_id: reasigmentCliendId,
 // 	};
 
 // 	for (const ticket of (tickets as IDataObject[])) {
-// 		console.log(ticket.id);
+// 		this.logger.debug(ticket.id);
 // 		await haloPSAApiRequest.call(this, 'DELETE', `/tickets/${ticket.id}`, accessToken);
 // 	}
 // }
diff --git a/packages/nodes-base/nodes/Ldap/Ldap.node.ts b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
index 52e9cd9d15..aa8f8413fc 100644
--- a/packages/nodes-base/nodes/Ldap/Ldap.node.ts
+++ b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
@@ -129,7 +129,7 @@ export class Ldap implements INodeType {
 					await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
 				} catch (error) {
 					await client.unbind();
-					console.log(error);
+					this.logger.error(error);
 					return [];
 				}
 
@@ -138,7 +138,7 @@ export class Ldap implements INodeType {
 				try {
 					results = await client.search(baseDN, { sizeLimit: 200, paged: false }); // should this size limit be set in credentials?
 				} catch (error) {
-					console.log(error);
+					this.logger.error(error);
 					return [];
 				} finally {
 					await client.unbind();
@@ -158,7 +158,7 @@ export class Ldap implements INodeType {
 					await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
 				} catch (error) {
 					await client.unbind();
-					console.log(error);
+					this.logger.error(error);
 					return [];
 				}
 
@@ -168,7 +168,7 @@ export class Ldap implements INodeType {
 				try {
 					results = await client.search(baseDN, { sizeLimit: 10, paged: false }); // should this size limit be set in credentials?
 				} catch (error) {
-					console.log(error);
+					this.logger.error(error);
 					return [];
 				} finally {
 					await client.unbind();
@@ -202,7 +202,7 @@ export class Ldap implements INodeType {
 					await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
 				} catch (error) {
 					await client.unbind();
-					console.log(error);
+					this.logger.error(error);
 					return [];
 				}
 
@@ -211,7 +211,7 @@ export class Ldap implements INodeType {
 				try {
 					results = await client.search(baseDN, { sizeLimit: 1, paged: false });
 				} catch (error) {
-					console.log(error);
+					this.logger.error(error);
 					return [];
 				} finally {
 					await client.unbind();
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts
index 88d111731c..24fccf49a4 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/versionDescription.ts
@@ -27,7 +27,7 @@ export const versionDescription: INodeTypeDescription = {
 	properties: [
 		{
 			displayName:
-				'This node connects to the Microsoft 365 cloud platform. Use the \'Extract from File\' and \'Convert to File\' nodes to directly manipulate spreadsheet files (.xls, .csv, etc). <a href="/templates/890" target="_blank">More info</a>.',
+				'This node connects to the Microsoft 365 cloud platform. Use the \'Extract from File\' and \'Convert to File\' nodes to directly manipulate spreadsheet files (.xls, .csv, etc). <a href="https://n8n.io/workflows/890-read-in-an-excel-spreadsheet-file/" target="_blank">More info</a>.',
 			name: 'notice',
 			type: 'notice',
 			default: '',
diff --git a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
index 32adcf0b79..3fda2c1f26 100644
--- a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
@@ -96,7 +96,7 @@ export function prepareItems(
 		data = items.filter((item) => item.json[updateKey] !== undefined);
 	}
 
-	const preperedItems = data.map(({ json }) => {
+	const preparedItems = data.map(({ json }) => {
 		const updateItem: IDataObject = {};
 
 		for (const field of fields) {
@@ -122,7 +122,7 @@ export function prepareItems(
 		return updateItem;
 	});
 
-	return preperedItems;
+	return preparedItems;
 }
 
 export function prepareFields(fields: string) {
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index df0fd29515..5bf2a3ce8e 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -1039,7 +1039,7 @@ export class Salesforce implements INodeType {
 			// async getFolders(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 			// 	const returnData: INodePropertyOptions[] = [];
 			// 	const fields = await salesforceApiRequestAllItems.call(this, 'records', 'GET', '/sobjects/folder/describe');
-			// 	console.log(JSON.stringify(fields, undefined, 2))
+			// 	this.logger.debug(JSON.stringify(fields, undefined, 2))
 			// 	const qs = {
 			// 		//ContentFolderItem ContentWorkspace ContentFolder
 			// 		q: `SELECT Id, Title FROM ContentVersion`,
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.ts b/packages/nodes-base/nodes/Slack/Slack.node.ts
index 0eac92e536..6906b26395 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.ts
+++ b/packages/nodes-base/nodes/Slack/Slack.node.ts
@@ -14,7 +14,7 @@ export class Slack extends VersionedNodeType {
 			group: ['output'],
 			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 			description: 'Consume Slack API',
-			defaultVersion: 2.2,
+			defaultVersion: 2.3,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
@@ -22,6 +22,7 @@ export class Slack extends VersionedNodeType {
 			2: new SlackV2(baseDescription),
 			2.1: new SlackV2(baseDescription),
 			2.2: new SlackV2(baseDescription),
+			2.3: new SlackV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index 590453308c..54cf540fd0 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,10 +8,9 @@ import type {
 	IRequestOptions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
-
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
+import type { SendAndWaitMessageBody } from './MessageInterface';
 import { getSendAndWaitConfig } from '../../../utils/sendAndWait/utils';
 
 export async function slackApiRequest(
@@ -265,7 +265,7 @@ export function createSendAndWaitMessageBody(context: IExecuteFunctions) {
 
 	const config = getSendAndWaitConfig(context);
 
-	const body: IDataObject = {
+	const body: SendAndWaitMessageBody = {
 		channel: target,
 		blocks: [
 			{
@@ -274,7 +274,7 @@ export function createSendAndWaitMessageBody(context: IExecuteFunctions) {
 			{
 				type: 'section',
 				text: {
-					type: 'plain_text',
+					type: context.getNode().typeVersion > 2.2 ? 'mrkdwn' : 'plain_text',
 					text: config.message,
 					emoji: true,
 				},
@@ -307,5 +307,9 @@ export function createSendAndWaitMessageBody(context: IExecuteFunctions) {
 		],
 	};
 
+	if (context.getNode().typeVersion > 2.2 && body.blocks?.[1]?.type === 'section') {
+		delete body.blocks[1].text.emoji;
+	}
+
 	return body;
 }
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageInterface.ts b/packages/nodes-base/nodes/Slack/V2/MessageInterface.ts
index 69c7b9cb4b..371b03951f 100644
--- a/packages/nodes-base/nodes/Slack/V2/MessageInterface.ts
+++ b/packages/nodes-base/nodes/Slack/V2/MessageInterface.ts
@@ -3,3 +3,36 @@ export interface IAttachment {
 		item?: object[];
 	};
 }
+
+// Used for SendAndWaitMessage
+export interface TextBlock {
+	type: string;
+	text: string;
+	emoji?: boolean;
+}
+
+export interface SectionBlock {
+	type: 'section';
+	text: TextBlock;
+}
+
+export interface DividerBlock {
+	type: 'divider';
+}
+
+export interface ButtonElement {
+	type: 'button';
+	style?: 'primary';
+	text: TextBlock;
+	url: string;
+}
+
+export interface ActionsBlock {
+	type: 'actions';
+	elements: ButtonElement[];
+}
+
+export interface SendAndWaitMessageBody {
+	channel: string;
+	blocks: Array<DividerBlock | SectionBlock | ActionsBlock>;
+}
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 3ba8cca7b8..5277750491 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -52,7 +52,7 @@ export class SlackV2 implements INodeType {
 	constructor(baseDescription: INodeTypeBaseDescription) {
 		this.description = {
 			...baseDescription,
-			version: [2, 2.1, 2.2],
+			version: [2, 2.1, 2.2, 2.3],
 			defaults: {
 				name: 'Slack',
 			},
diff --git a/packages/nodes-base/nodes/Slack/test/v2/utils.test.ts b/packages/nodes-base/nodes/Slack/test/v2/utils.test.ts
index 634ee25900..e56decf79f 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/utils.test.ts
@@ -1,5 +1,6 @@
 import { type MockProxy, mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
 import { getTarget, createSendAndWaitMessageBody } from '../../V2/GenericFunctions';
 
 describe('Slack Utility Functions', () => {
@@ -12,7 +13,7 @@ describe('Slack Utility Functions', () => {
 	});
 
 	describe('getTarget', () => {
-		it('should return corect target id', () => {
+		it('should return correct target id', () => {
 			mockExecuteFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
 				if (parameterName === 'user') {
 					return 'testUser';
@@ -26,7 +27,7 @@ describe('Slack Utility Functions', () => {
 	});
 
 	describe('createSendAndWaitMessageBody', () => {
-		it('should create message with single button', () => {
+		it('should create message with single button - pre 2.3 plain_text', () => {
 			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('channel');
 			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('channelID');
 
@@ -79,7 +80,7 @@ describe('Slack Utility Functions', () => {
 			});
 		});
 
-		it('should create message with double buttona', () => {
+		it('should create message with double buttons - pre 2.3 plain_text', () => {
 			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('channel');
 			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('channelID');
 
@@ -142,5 +143,123 @@ describe('Slack Utility Functions', () => {
 				channel: 'channelID',
 			});
 		});
+
+		it('should create message with single button - 2.3+ mrkdwn', () => {
+			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({});
+			mockExecuteFunctions.getNode.mockReturnValue({ name: 'Slack', typeVersion: 2.3 } as any);
+
+			expect(createSendAndWaitMessageBody(mockExecuteFunctions)).toEqual({
+				blocks: [
+					{
+						type: 'divider',
+					},
+					{
+						text: {
+							text: 'message',
+							type: 'mrkdwn',
+						},
+						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 buttons - 2.3+ mrkdwn', () => {
+			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' });
+
+			mockExecuteFunctions.getNode.mockReturnValue({ name: 'Slack', typeVersion: 2.3 } as any);
+
+			expect(createSendAndWaitMessageBody(mockExecuteFunctions)).toEqual({
+				blocks: [
+					{
+						type: 'divider',
+					},
+					{
+						text: {
+							text: 'message',
+							type: 'mrkdwn',
+						},
+						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/Webflow/GenericFunctions.ts b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
index 49d02bcf04..5743274b1e 100644
--- a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 	IHttpRequestMethods,
-	IRequestOptions,
+	IHttpRequestOptions,
 	INodePropertyOptions,
 } from 'n8n-workflow';
 
@@ -20,26 +20,25 @@ export async function webflowApiRequest(
 ) {
 	let credentialsType = 'webflowOAuth2Api';
 
-	let options: IRequestOptions = {
+	let options: IHttpRequestOptions = {
 		method,
 		qs,
 		body,
-		uri: uri || `https://api.webflow.com${resource}`,
+		url: uri || `https://api.webflow.com${resource}`,
 		json: true,
 	};
 	options = Object.assign({}, options, option);
 
 	// Keep support for v1 node
 	if (this.getNode().typeVersion === 1) {
-		console.log('v1');
 		const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken');
 		if (authenticationMethod === 'accessToken') {
 			credentialsType = 'webflowApi';
 		}
 		options.headers = { 'accept-version': '1.0.0' };
 	} else {
-		options.resolveWithFullResponse = true;
-		options.uri = `https://api.webflow.com/v2${resource}`;
+		options.returnFullResponse = true;
+		options.url = `https://api.webflow.com/v2${resource}`;
 	}
 
 	if (Object.keys(options.qs as IDataObject).length === 0) {
@@ -49,7 +48,7 @@ export async function webflowApiRequest(
 	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
-	return await this.helpers.requestWithAuthentication.call(this, credentialsType, options);
+	return await this.helpers.httpRequestWithAuthentication.call(this, credentialsType, options);
 }
 
 export async function webflowApiRequestAllItems(
@@ -58,21 +57,28 @@ export async function webflowApiRequestAllItems(
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
-) {
+): Promise<IDataObject[]> {
 	const returnData: IDataObject[] = [];
-
 	let responseData;
 
 	query.limit = 100;
 	query.offset = 0;
 
+	const isTypeVersion1 = this.getNode().typeVersion === 1;
+
 	do {
 		responseData = await webflowApiRequest.call(this, method, endpoint, body, query);
-		if (responseData.offset !== undefined) {
+		const items = isTypeVersion1 ? responseData.items : responseData.body.items;
+		returnData.push(...(items as IDataObject[]));
+
+		if (responseData.offset !== undefined || responseData?.body?.pagination?.offset !== undefined) {
 			query.offset += query.limit;
 		}
-		returnData.push.apply(returnData, responseData.items as IDataObject[]);
-	} while (returnData.length < responseData.total);
+	} while (
+		isTypeVersion1
+			? returnData.length < responseData.total
+			: returnData.length < responseData.body.pagination.total
+	);
 
 	return returnData;
 }
@@ -81,8 +87,6 @@ export async function getSites(this: ILoadOptionsFunctions): Promise<INodeProper
 	const returnData: INodePropertyOptions[] = [];
 	const response = await webflowApiRequest.call(this, 'GET', '/sites');
 
-	console.log(response);
-
 	const sites = response.body?.sites || response;
 
 	for (const site of sites) {
diff --git a/packages/nodes-base/nodes/Webflow/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Webflow/test/GenericFunctions.test.ts
new file mode 100644
index 0000000000..cdccca5189
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/test/GenericFunctions.test.ts
@@ -0,0 +1,66 @@
+import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { webflowApiRequestAllItems } from '../GenericFunctions';
+
+describe('Webflow -> webflowApiRequestAllItems', () => {
+	let mockExecuteFunctions: IExecuteFunctions | ILoadOptionsFunctions;
+
+	const v1Response = {
+		items: [
+			{ id: '1', name: 'Item 1' },
+			{ id: '2', name: 'Item 2' },
+		],
+		total: 2,
+	};
+
+	const v2Response = {
+		body: {
+			items: [
+				{ id: '1', name: 'Item 1' },
+				{ id: '2', name: 'Item 2' },
+			],
+			pagination: {
+				total: 2,
+			},
+		},
+	};
+
+	const setupMockFunctions = (typeVersion: number) => {
+		mockExecuteFunctions = {
+			getNode: jest.fn().mockReturnValue({ typeVersion }),
+			getNodeParameter: jest.fn(),
+			helpers: {
+				httpRequestWithAuthentication: jest
+					.fn()
+					.mockResolvedValue(typeVersion === 1 ? v1Response : v2Response),
+			},
+		} as unknown as IExecuteFunctions | ILoadOptionsFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions(1);
+	});
+
+	it('should return all items for type version 1', async () => {
+		const result = await webflowApiRequestAllItems.call(
+			mockExecuteFunctions,
+			'GET',
+			'/collections/collection_id/items',
+		);
+
+		expect(result).toEqual(v1Response.items);
+	});
+
+	it('should return all items for type version 2', async () => {
+		setupMockFunctions(2);
+
+		const result = await webflowApiRequestAllItems.call(
+			mockExecuteFunctions,
+			'GET',
+			'/collections/collection_id/items',
+		);
+
+		expect(result).toEqual(v2Response.body.items);
+	});
+});
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 007c48f6ea..ce020e5c65 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.68.0",
+  "version": "1.70.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
@@ -225,6 +225,7 @@
       "dist/credentials/MicrosoftOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftOneDriveOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftOutlookOAuth2Api.credentials.js",
+      "dist/credentials/MicrosoftSharePointOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftSql.credentials.js",
       "dist/credentials/MicrosoftTeamsOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftToDoOAuth2Api.credentials.js",
@@ -380,6 +381,7 @@
       "dist/credentials/XeroOAuth2Api.credentials.js",
       "dist/credentials/YourlsApi.credentials.js",
       "dist/credentials/YouTubeOAuth2Api.credentials.js",
+      "dist/credentials/ZabbixApi.credentials.js",
       "dist/credentials/ZammadBasicAuthApi.credentials.js",
       "dist/credentials/ZammadTokenAuthApi.credentials.js",
       "dist/credentials/ZendeskApi.credentials.js",
@@ -867,7 +869,7 @@
     "generate-schema": "2.6.0",
     "gm": "1.25.0",
     "html-to-text": "9.0.5",
-    "iconv-lite": "0.6.3",
+    "iconv-lite": "catalog:",
     "ics": "2.40.0",
     "isbot": "3.6.13",
     "iso-639-1": "2.1.15",
@@ -881,7 +883,7 @@
     "mailparser": "3.6.7",
     "minifaker": "1.34.1",
     "moment-timezone": "0.5.37",
-    "mongodb": "6.3.0",
+    "mongodb": "6.11.0",
     "mqtt": "5.7.2",
     "mssql": "10.0.2",
     "mysql2": "3.11.0",
diff --git a/packages/nodes-base/utils/sendAndWait/email-templates.ts b/packages/nodes-base/utils/sendAndWait/email-templates.ts
index 0ae8d7689a..8c9bd20345 100644
--- a/packages/nodes-base/utils/sendAndWait/email-templates.ts
+++ b/packages/nodes-base/utils/sendAndWait/email-templates.ts
@@ -11,7 +11,7 @@ export const ACTION_RECORDED_PAGE = `
 		<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'
+			href='https://fonts.googleapis.com/css?family=Open+Sans'
 			rel='stylesheet'
 			type='text/css'
 		/>
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 16589e19c4..7f35e94314 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.67.0",
+  "version": "1.69.0",
   "description": "Workflow base code of n8n",
   "main": "dist/index.js",
   "module": "src/index.ts",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 10dc222d2b..0a7a5d0379 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -2244,7 +2244,7 @@ export interface IWorkflowExecuteHooks {
 	>;
 	nodeExecuteBefore?: Array<(nodeName: string) => Promise<void>>;
 	workflowExecuteAfter?: Array<(data: IRun, newStaticData: IDataObject) => Promise<void>>;
-	workflowExecuteBefore?: Array<(workflow: Workflow, data: IRunExecutionData) => Promise<void>>;
+	workflowExecuteBefore?: Array<(workflow?: Workflow, data?: IRunExecutionData) => Promise<void>>;
 	sendResponse?: Array<(response: IExecuteResponsePromiseData) => Promise<void>>;
 }
 
@@ -2274,6 +2274,7 @@ export interface IWorkflowExecutionDataProcess {
 	 *      PARTIAL_EXECUTION_VERSION_DEFAULT
 	 */
 	partialExecutionVersion?: string;
+	dirtyNodeNames?: string[];
 }
 
 export interface ExecuteWorkflowOptions {
@@ -2371,7 +2372,8 @@ export type WorkflowExecuteMode =
 	| 'manual'
 	| 'retry'
 	| 'trigger'
-	| 'webhook';
+	| 'webhook'
+	| 'evaluation';
 
 export type WorkflowActivateMode =
 	| 'init'
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index ea569e5886..9fb5ef8beb 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -435,7 +435,7 @@ export class Workflow {
 			) {
 				// Is expression so has to be rewritten
 				// To not run the "expensive" regex stuff when it is not needed
-				// make a simple check first if it really contains the the node-name
+				// make a simple check first if it really contains the node-name
 				if (parameterValue.includes(currentName)) {
 					// Really contains node-name (even though we do not know yet if really as $node-expression)
 
diff --git a/packages/workflow/src/errors/expression.error.ts b/packages/workflow/src/errors/expression.error.ts
index 32aaae3812..5e56b694f8 100644
--- a/packages/workflow/src/errors/expression.error.ts
+++ b/packages/workflow/src/errors/expression.error.ts
@@ -30,7 +30,7 @@ export interface ExpressionErrorOptions {
  */
 export class ExpressionError extends ExecutionBaseError {
 	constructor(message: string, options?: ExpressionErrorOptions) {
-		super(message, { cause: options?.cause });
+		super(message, { cause: options?.cause, level: 'warning' });
 
 		if (options?.description !== undefined) {
 			this.description = options.description;
diff --git a/patches/vue-tsc@2.1.6.patch b/patches/vue-tsc@2.1.6.patch
new file mode 100644
index 0000000000..4603d9e89f
--- /dev/null
+++ b/patches/vue-tsc@2.1.6.patch
@@ -0,0 +1,13 @@
+diff --git a/index.js b/index.js
+index a680d25dfa98a45a3efec0bfb493500e6e9faa91..ca90b6226c88b5bc27aa5323c4e0e5f30f5b9ef2 100644
+--- a/index.js
++++ b/index.js
+@@ -4,7 +4,7 @@ exports.run = run;
+ const runTsc_1 = require("@volar/typescript/lib/quickstart/runTsc");
+ const vue = require("@vue/language-core");
+ const windowsPathReg = /\\/g;
+-function run(tscPath = require.resolve('typescript/lib/tsc')) {
++function run(tscPath = require.resolve('typescript/lib/_tsc')) {
+     let runExtensions = ['.vue'];
+     const extensionsChangedException = new Error('extensions changed');
+     const main = () => (0, runTsc_1.runTsc)(tscPath, runExtensions, (ts, options) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3098779b1b..e9f9272318 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,6 +45,9 @@ catalogs:
     form-data:
       specifier: 4.0.0
       version: 4.0.0
+    iconv-lite:
+      specifier: 0.6.3
+      version: 0.6.3
     lodash:
       specifier: 4.17.21
       version: 4.17.21
@@ -107,7 +110,7 @@ overrides:
   semver: ^7.5.4
   tslib: ^2.6.2
   tsconfig-paths: ^4.2.0
-  typescript: ^5.6.2
+  typescript: ^5.7.2
   vue-tsc: ^2.1.6
   ws: '>=8.17.1'
 
@@ -130,6 +133,9 @@ patchedDependencies:
   typedi@0.10.0:
     hash: sk6omkefrosihg7lmqbzh7vfxe
     path: patches/typedi@0.10.0.patch
+  vue-tsc@2.1.6:
+    hash: z2iuqlt7ype4qnrwd5eymeecl4
+    path: patches/vue-tsc@2.1.6.patch
 
 importers:
 
@@ -155,7 +161,7 @@ importers:
         version: 7.0.3
       jest:
         specifier: ^29.6.2
-        version: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+        version: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       jest-environment-jsdom:
         specifier: ^29.6.2
         version: 29.6.2
@@ -167,7 +173,7 @@ importers:
         version: 29.6.2
       jest-mock-extended:
         specifier: ^3.0.4
-        version: 3.0.4(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)))(typescript@5.6.2)
+        version: 3.0.4(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)))(typescript@5.7.2)
       lefthook:
         specifier: ^1.7.15
         version: 1.7.15
@@ -191,19 +197,19 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.1.1(@babel/core@7.24.0)(@jest/types@29.6.1)(babel-jest@29.6.2(@babel/core@7.24.0))(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)))(typescript@5.6.2)
+        version: 29.1.1(@babel/core@7.24.0)(@jest/types@29.6.1)(babel-jest@29.6.2(@babel/core@7.24.0))(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)))(typescript@5.7.2)
       tsc-alias:
         specifier: ^1.8.10
         version: 1.8.10
       tsc-watch:
         specifier: ^6.2.0
-        version: 6.2.0(typescript@5.6.2)
+        version: 6.2.0(typescript@5.7.2)
       turbo:
-        specifier: 2.1.2
-        version: 2.1.2
+        specifier: 2.3.3
+        version: 2.3.3
       typescript:
-        specifier: ^5.6.2
-        version: 5.6.2
+        specifier: ^5.7.2
+        version: 5.7.2
       zx:
         specifier: ^8.1.4
         version: 8.1.4
@@ -299,7 +305,7 @@ importers:
     dependencies:
       '@vueuse/core':
         specifier: ^10.11.0
-        version: 10.11.0(vue@3.5.11(typescript@5.6.2))
+        version: 10.11.0(vue@3.5.11(typescript@5.7.2))
       highlight.js:
         specifier: catalog:frontend
         version: 11.9.0
@@ -311,10 +317,10 @@ importers:
         version: 10.0.0
       vue:
         specifier: catalog:frontend
-        version: 3.5.11(typescript@5.6.2)
+        version: 3.5.11(typescript@5.7.2)
       vue-markdown-render:
         specifier: catalog:frontend
-        version: 2.2.1(vue@3.5.11(typescript@5.6.2))
+        version: 2.2.1(vue@3.5.11(typescript@5.7.2))
     devDependencies:
       '@iconify-json/mdi':
         specifier: ^1.1.54
@@ -333,13 +339,13 @@ importers:
         version: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
       vite-plugin-dts:
         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))
+        version: 4.2.3(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.7.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.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
       vue-tsc:
         specifier: ^2.1.6
-        version: 2.1.6(typescript@5.6.2)
+        version: 2.1.6(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
 
   packages/@n8n/client-oauth2:
     dependencies:
@@ -375,7 +381,7 @@ importers:
   packages/@n8n/imap:
     dependencies:
       iconv-lite:
-        specifier: 0.6.3
+        specifier: 'catalog:'
         version: 0.6.3
       imap:
         specifier: 0.8.19
@@ -446,7 +452,7 @@ importers:
         version: 0.3.1(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/community':
         specifier: 0.3.11
-        version: 0.3.11(simkpjwqw7qnwbripe37u5qu7a)
+        version: 0.3.11(ndajhtzj4xqxxpqz4t56suvqri)
       '@langchain/core':
         specifier: 'catalog:'
         version: 0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8))
@@ -473,7 +479,7 @@ importers:
         version: 0.1.1(@langchain/core@0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8)))
       '@langchain/qdrant':
         specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8)))(typescript@5.6.2)
+        version: 0.1.0(@langchain/core@0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8)))(typescript@5.7.2)
       '@langchain/redis':
         specifier: 0.1.0
         version: 0.1.0(@langchain/core@0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8)))
@@ -488,7 +494,7 @@ importers:
         version: link:../json-schema-to-zod
       '@n8n/typeorm':
         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))
+        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.7.2))
       '@n8n/vm2':
         specifier: 3.9.25
         version: 3.9.25
@@ -497,13 +503,13 @@ importers:
         version: 3.0.3
       '@qdrant/js-client-rest':
         specifier: 1.11.0
-        version: 1.11.0(typescript@5.6.2)
+        version: 1.11.0(typescript@5.7.2)
       '@supabase/supabase-js':
         specifier: 2.45.4
         version: 2.45.4
       '@xata.io/client':
         specifier: 0.28.4
-        version: 0.28.4(typescript@5.6.2)
+        version: 0.28.4(typescript@5.7.2)
       basic-auth:
         specifier: 'catalog:'
         version: 2.0.1
@@ -638,10 +644,10 @@ importers:
         version: 8.3.5(storybook@8.3.5)
       '@storybook/vue3':
         specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)(vue@3.5.11(typescript@5.6.2))
+        version: 8.3.5(storybook@8.3.5)(vue@3.5.11(typescript@5.7.2))
       '@storybook/vue3-vite':
         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))
+        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.7.2))
       chromatic:
         specifier: ^11.10.2
         version: 11.10.2
@@ -693,28 +699,28 @@ importers:
         version: 8.56.5
       '@typescript-eslint/eslint-plugin':
         specifier: ^7.2.0
-        version: 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2)
+        version: 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)
       '@typescript-eslint/parser':
         specifier: ^7.2.0
-        version: 7.2.0(eslint@8.57.0)(typescript@5.6.2)
+        version: 7.2.0(eslint@8.57.0)(typescript@5.7.2)
       '@vue/eslint-config-typescript':
         specifier: ^13.0.0
-        version: 13.0.0(eslint-plugin-vue@9.23.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.6.2)
+        version: 13.0.0(eslint-plugin-vue@9.23.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.7.2)
       eslint:
         specifier: ^8.57.0
         version: 8.57.0
       eslint-config-airbnb-typescript:
         specifier: ^18.0.0
-        version: 18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0)
+        version: 18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0)
       eslint-config-prettier:
         specifier: ^9.1.0
         version: 9.1.0(eslint@8.57.0)
       eslint-import-resolver-typescript:
         specifier: ^3.6.1
-        version: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+        version: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       eslint-plugin-lodash:
         specifier: ^7.4.0
         version: 7.4.0(eslint@8.57.0)
@@ -726,7 +732,7 @@ importers:
         version: 51.0.1(eslint@8.57.0)
       eslint-plugin-unused-imports:
         specifier: ^3.1.0
-        version: 3.1.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)
+        version: 3.1.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)
       eslint-plugin-vue:
         specifier: ^9.23.0
         version: 9.23.0(eslint@8.57.0)
@@ -768,7 +774,7 @@ importers:
         version: link:../@n8n/task-runner
       '@n8n/typeorm':
         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))
+        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.7.2))
       '@n8n_io/ai-assistant-sdk':
         specifier: 1.10.3
         version: 1.10.3
@@ -1105,7 +1111,7 @@ importers:
         version: 4.15.3(encoding@0.1.13)
       ts-essentials:
         specifier: ^7.0.3
-        version: 7.0.3(typescript@5.6.2)
+        version: 7.0.3(typescript@5.7.2)
 
   packages/core:
     dependencies:
@@ -1139,6 +1145,9 @@ importers:
       form-data:
         specifier: 'catalog:'
         version: 4.0.0
+      iconv-lite:
+        specifier: 'catalog:'
+        version: 0.6.3
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
@@ -1214,10 +1223,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.5.11(typescript@5.6.2))
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.7.2))
       element-plus:
         specifier: 2.4.3
-        version: 2.4.3(vue@3.5.11(typescript@5.6.2))
+        version: 2.4.3(vue@3.5.11(typescript@5.7.2))
       markdown-it:
         specifier: ^13.0.2
         version: 13.0.2
@@ -1238,13 +1247,13 @@ importers:
         version: 2.12.1
       vue:
         specifier: catalog:frontend
-        version: 3.5.11(typescript@5.6.2)
+        version: 3.5.11(typescript@5.7.2)
       vue-boring-avatars:
         specifier: ^1.3.0
-        version: 1.3.0(vue@3.5.11(typescript@5.6.2))
+        version: 1.3.0(vue@3.5.11(typescript@5.7.2))
       vue-router:
         specifier: catalog:frontend
-        version: 4.4.5(vue@3.5.11(typescript@5.6.2))
+        version: 4.4.5(vue@3.5.11(typescript@5.7.2))
       xss:
         specifier: 'catalog:'
         version: 1.0.15
@@ -1260,7 +1269,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.5.11)(vue@3.5.11(typescript@5.6.2))
+        version: 8.1.0(@vue/compiler-sfc@3.5.11)(vue@3.5.11(typescript@5.7.2))
       '@types/markdown-it':
         specifier: ^13.0.9
         version: 13.0.9
@@ -1275,7 +1284,7 @@ importers:
         version: 2.11.0
       '@vitejs/plugin-vue':
         specifier: ^5.1.4
-        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))
+        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.7.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
         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))
@@ -1290,13 +1299,13 @@ importers:
         version: 1.64.1
       tailwindcss:
         specifier: ^3.4.3
-        version: 3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+        version: 3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       unplugin-icons:
         specifier: ^0.19.0
         version: 0.19.0(@vue/compiler-sfc@3.5.11)
       unplugin-vue-components:
         specifier: ^0.27.2
-        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.11(typescript@5.6.2))
+        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.11(typescript@5.7.2))
       vite:
         specifier: catalog:frontend
         version: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
@@ -1305,10 +1314,10 @@ importers:
         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.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.0.2(typescript@5.7.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: ^2.1.6
-        version: 2.1.6(typescript@5.6.2)
+        version: 2.1.6(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
 
   packages/editor-ui:
     dependencies:
@@ -1353,7 +1362,7 @@ importers:
         version: 5.15.4
       '@fortawesome/vue-fontawesome':
         specifier: '*'
-        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.6.2))
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.7.2))
       '@jsplumb/browser-ui':
         specifier: ^5.13.2
         version: 5.13.2
@@ -1389,28 +1398,28 @@ importers:
         version: link:../@n8n/permissions
       '@sentry/vue':
         specifier: catalog:frontend
-        version: 8.33.1(vue@3.5.11(typescript@5.6.2))
+        version: 8.33.1(vue@3.5.11(typescript@5.7.2))
       '@vue-flow/background':
         specifier: ^1.3.1
-        version: 1.3.1(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
+        version: 1.3.1(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))
       '@vue-flow/controls':
         specifier: ^1.1.2
-        version: 1.1.2(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
+        version: 1.1.2(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))
       '@vue-flow/core':
         specifier: ^1.41.4
-        version: 1.41.4(vue@3.5.11(typescript@5.6.2))
+        version: 1.41.4(vue@3.5.11(typescript@5.7.2))
       '@vue-flow/minimap':
         specifier: ^1.5.0
-        version: 1.5.0(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
+        version: 1.5.0(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))
       '@vue-flow/node-resizer':
         specifier: ^1.4.0
-        version: 1.4.0(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
+        version: 1.4.0(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))
       '@vueuse/components':
         specifier: ^10.11.0
-        version: 10.11.0(vue@3.5.11(typescript@5.6.2))
+        version: 10.11.0(vue@3.5.11(typescript@5.7.2))
       '@vueuse/core':
         specifier: ^10.11.0
-        version: 10.11.0(vue@3.5.11(typescript@5.6.2))
+        version: 10.11.0(vue@3.5.11(typescript@5.7.2))
       axios:
         specifier: 'catalog:'
         version: 1.7.4
@@ -1467,13 +1476,13 @@ importers:
         version: link:../workflow
       pinia:
         specifier: ^2.2.4
-        version: 2.2.4(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2))
+        version: 2.2.4(typescript@5.7.2)(vue@3.5.11(typescript@5.7.2))
       prettier:
         specifier: ^3.3.3
         version: 3.3.3
       qrcode.vue:
         specifier: ^3.3.4
-        version: 3.3.4(vue@3.5.11(typescript@5.6.2))
+        version: 3.3.4(vue@3.5.11(typescript@5.7.2))
       stream-browserify:
         specifier: ^3.0.0
         version: 3.0.0
@@ -1488,28 +1497,31 @@ importers:
         version: 1.2.2
       vue:
         specifier: catalog:frontend
-        version: 3.5.11(typescript@5.6.2)
+        version: 3.5.11(typescript@5.7.2)
       vue-agile:
         specifier: ^2.0.0
         version: 2.0.0
       vue-chartjs:
         specifier: ^5.2.0
-        version: 5.2.0(chart.js@4.4.0)(vue@3.5.11(typescript@5.6.2))
+        version: 5.2.0(chart.js@4.4.0)(vue@3.5.11(typescript@5.7.2))
       vue-github-button:
         specifier: ^3.1.3
         version: 3.1.3
       vue-i18n:
         specifier: ^9.2.2
-        version: 9.2.2(vue@3.5.11(typescript@5.6.2))
+        version: 9.2.2(vue@3.5.11(typescript@5.7.2))
       vue-json-pretty:
         specifier: 2.2.4
-        version: 2.2.4(vue@3.5.11(typescript@5.6.2))
+        version: 2.2.4(vue@3.5.11(typescript@5.7.2))
       vue-markdown-render:
         specifier: catalog:frontend
-        version: 2.2.1(vue@3.5.11(typescript@5.6.2))
+        version: 2.2.1(vue@3.5.11(typescript@5.7.2))
       vue-router:
         specifier: catalog:frontend
-        version: 4.4.5(vue@3.5.11(typescript@5.6.2))
+        version: 4.4.5(vue@3.5.11(typescript@5.7.2))
+      vue-virtual-scroller:
+        specifier: 2.0.0-beta.8
+        version: 2.0.0-beta.8(vue@3.5.11(typescript@5.7.2))
       vue3-touch-events:
         specifier: ^4.1.3
         version: 4.1.3
@@ -1525,7 +1537,7 @@ importers:
         version: 2.2.230
       '@pinia/testing':
         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))
+        version: 0.1.6(pinia@2.2.4(typescript@5.7.2)(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))
       '@types/dateformat':
         specifier: ^3.0.0
         version: 3.0.1
@@ -1558,7 +1570,7 @@ importers:
         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.24.0)(vue@3.5.11(typescript@5.6.2))
+        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.11(typescript@5.7.2))
       vite:
         specifier: catalog:frontend
         version: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
@@ -1567,10 +1579,10 @@ importers:
         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.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.0.2(typescript@5.7.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: ^2.1.6
-        version: 2.1.6(typescript@5.6.2)
+        version: 2.1.6(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
 
   packages/node-dev:
     dependencies:
@@ -1675,7 +1687,7 @@ importers:
         specifier: 9.0.5
         version: 9.0.5
       iconv-lite:
-        specifier: 0.6.3
+        specifier: 'catalog:'
         version: 0.6.3
       ics:
         specifier: 2.40.0
@@ -1717,8 +1729,8 @@ importers:
         specifier: 0.5.37
         version: 0.5.37
       mongodb:
-        specifier: 6.3.0
-        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)
+        specifier: 6.11.0
+        version: 6.11.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.8.3)
       mqtt:
         specifier: 5.7.2
         version: 5.7.2
@@ -1878,7 +1890,7 @@ importers:
         version: 0.4.14
       eslint-plugin-n8n-nodes-base:
         specifier: ^1.16.3
-        version: 1.16.3(eslint@8.57.0)(typescript@5.6.2)
+        version: 1.16.3(eslint@8.57.0)(typescript@5.7.2)
       n8n-core:
         specifier: workspace:*
         version: link:../core
@@ -3898,7 +3910,7 @@ packages:
     resolution: {integrity: sha512-RzF+HxL8A7bb/uaxU1jVS1a919bb3FCo1giB/D19UT3d50AYl4+4AyklbsjlXpWEHekbNocQAQ016fqT9hSRtQ==}
     engines: {node: '>=18.0.0', pnpm: '>=8'}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
 
   '@qdrant/openapi-typescript-fetch@1.2.6':
     resolution: {integrity: sha512-oQG/FejNpItrxRHoyctYvT3rwGZOnK4jr3JdppO/c78ktDvkWiPXPHNsrDf33K9sZdRb6PR7gi4noIapu5q4HA==}
@@ -4539,7 +4551,7 @@ packages:
     peerDependencies:
       '@preact/preset-vite': '*'
       storybook: ^8.3.5
-      typescript: ^5.6.2
+      typescript: ^5.7.2
       vite: ^4.0.0 || ^5.0.0
       vite-plugin-glimmerx: '*'
     peerDependenciesMeta:
@@ -5351,7 +5363,7 @@ packages:
     peerDependencies:
       eslint: ^8.56.0
       eslint-plugin-vue: ^9.0.0
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       typescript:
         optional: true
@@ -5359,7 +5371,7 @@ packages:
   '@vue/language-core@2.1.6':
     resolution: {integrity: sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       typescript:
         optional: true
@@ -5411,7 +5423,7 @@ packages:
   '@xata.io/client@0.28.4':
     resolution: {integrity: sha512-B02WHIA/ViHya84XvH6JCo13rd5h4S5vVyY2aYi6fIcjDIbCpsSLJ4oGWpdodovRYeAZy9Go4OhdyZwMIRC4BQ==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
 
   '@xmldom/xmldom@0.8.6':
     resolution: {integrity: sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==}
@@ -5901,8 +5913,8 @@ packages:
   bser@2.1.1:
     resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
 
-  bson@6.8.0:
-    resolution: {integrity: sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==}
+  bson@6.10.0:
+    resolution: {integrity: sha512-ROchNosXMJD2cbQGm84KoP7vOGPO6/bOAW0veMMbzhXLqoZptcaYRVLitwvuhwhjjpU1qP4YZRWLhgETdgqUQw==}
     engines: {node: '>=16.20.1'}
 
   buffer-crc32@0.2.13:
@@ -8060,8 +8072,9 @@ packages:
     resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
     engines: {node: '>=12.22.0'}
 
-  ip@2.0.1:
-    resolution: {integrity: sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==}
+  ip-address@9.0.5:
+    resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
+    engines: {node: '>= 12'}
 
   ipaddr.js@1.9.1:
     resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
@@ -8406,7 +8419,7 @@ packages:
     resolution: {integrity: sha512-2ynEZ7IEJNrhrgshklDMhrOdnmW4Nt+PhkyRqZxRgpwMo7JjmFWMzyp0+eSyk+H9KK1QjXI5xTZIw6x7cVDcRg==}
     peerDependencies:
       jest: ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0
-      typescript: ^5.6.2
+      typescript: ^5.7.2
 
   jest-mock@29.6.2:
     resolution: {integrity: sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==}
@@ -8536,6 +8549,9 @@ packages:
   jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
+  jsbn@1.1.0:
+    resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
+
   jsdoc-type-pratt-parser@4.1.0:
     resolution: {integrity: sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==}
     engines: {node: '>=12.0.0'}
@@ -9240,6 +9256,9 @@ packages:
     resolution: {integrity: sha512-MGZAq0Q3OuRYgZKvlB69z4gLN4G3PvgC4A2zhkCXCXrLD5wm2cCnwNB59xOBVA+srZ0zEes6u+VylcPIkB4SqA==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
+  mitt@2.1.0:
+    resolution: {integrity: sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==}
+
   mjml-accordion@4.15.3:
     resolution: {integrity: sha512-LPNVSj1LyUVYT9G1gWwSw3GSuDzDsQCu0tPB2uDsq4VesYNnU6v3iLCQidMiR6azmIt13OEozG700ygAUuA6Ng==}
 
@@ -9400,8 +9419,8 @@ packages:
   mongodb-connection-string-url@3.0.0:
     resolution: {integrity: sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==}
 
-  mongodb@6.3.0:
-    resolution: {integrity: sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==}
+  mongodb@6.11.0:
+    resolution: {integrity: sha512-yVbPw0qT268YKhG241vAMLaDQAPbRyTgo++odSgGc9kXnzOujQI60Iyj23B9sQQFPSvmNPvMZ3dsFz0aN55KgA==}
     engines: {node: '>=16.20.1'}
     peerDependencies:
       '@aws-sdk/credential-providers': ^3.188.0
@@ -10076,7 +10095,7 @@ packages:
     resolution: {integrity: sha512-K7ZhpMY9iJ9ShTC0cR2+PnxdQRuwVIsXDO/WIEV/RnMC/vmSoKDTKW/exNQYPI+4ij10UjXqdNiEHwn47McANQ==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
-      typescript: ^5.6.2
+      typescript: ^5.7.2
       vue: ^2.6.14 || ^3.3.0
     peerDependenciesMeta:
       '@vue/composition-api':
@@ -10996,13 +11015,9 @@ packages:
     resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==}
     engines: {node: '>= 10'}
 
-  socks@2.7.1:
-    resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
-    engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
-
-  source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
+  socks@2.8.3:
+    resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==}
+    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
 
   source-map-js@1.2.0:
     resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
@@ -11064,6 +11079,9 @@ packages:
   sprintf-js@1.1.2:
     resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==}
 
+  sprintf-js@1.1.3:
+    resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
+
   sqlite3@5.1.7:
     resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
 
@@ -11510,7 +11528,7 @@ packages:
     resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==}
     engines: {node: '>=16.13.0'}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
 
   ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
@@ -11519,7 +11537,7 @@ packages:
   ts-essentials@10.0.2:
     resolution: {integrity: sha512-Xwag0TULqriaugXqVdDiGZ5wuZpqABZlpwQ2Ho4GDyiu/R2Xjkp/9+zcFxL7uzeLl/QCPrflnvpVYyS3ouT7Zw==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       typescript:
         optional: true
@@ -11527,7 +11545,7 @@ packages:
   ts-essentials@7.0.3:
     resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
 
   ts-ics@1.2.2:
     resolution: {integrity: sha512-L7T5JQi99qQ2Uv7AoCHUZ8Mx1bJYo7qBZtBckuHueR90I3WVdW5NC/tOqTVgu18c3zj08du+xlgWlTIcE+Foxw==}
@@ -11549,7 +11567,7 @@ packages:
       babel-jest: ^29.0.0
       esbuild: '*'
       jest: ^29.0.0
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       '@babel/core':
         optional: true
@@ -11570,7 +11588,7 @@ packages:
       '@swc/core': '>=1.2.50'
       '@swc/wasm': '>=1.2.50'
       '@types/node': ^18.16.16
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       '@swc/core':
         optional: true
@@ -11594,7 +11612,7 @@ packages:
     engines: {node: '>=12.12.0'}
     hasBin: true
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
 
   tsconfig-paths@4.2.0:
     resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
@@ -11614,38 +11632,38 @@ packages:
     resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==}
     engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
 
-  turbo-darwin-64@2.1.2:
-    resolution: {integrity: sha512-3TEBxHWh99h2yIzkuIigMEOXt/ItYQp0aPiJjPd1xN4oDcsKK5AxiFKPH9pdtfIBzYsY59kQhZiFj0ELnSP7Bw==}
+  turbo-darwin-64@2.3.3:
+    resolution: {integrity: sha512-bxX82xe6du/3rPmm4aCC5RdEilIN99VUld4HkFQuw+mvFg6darNBuQxyWSHZTtc25XgYjQrjsV05888w1grpaA==}
     cpu: [x64]
     os: [darwin]
 
-  turbo-darwin-arm64@2.1.2:
-    resolution: {integrity: sha512-he0miWNq2WxJzsH82jS2Z4MXpnkzn9SH8a79iPXiJkq25QREImucscM4RPasXm8wARp91pyysJMq6aasD45CeA==}
+  turbo-darwin-arm64@2.3.3:
+    resolution: {integrity: sha512-DYbQwa3NsAuWkCUYVzfOUBbSUBVQzH5HWUFy2Kgi3fGjIWVZOFk86ss+xsWu//rlEAfYwEmopigsPYSmW4X15A==}
     cpu: [arm64]
     os: [darwin]
 
-  turbo-linux-64@2.1.2:
-    resolution: {integrity: sha512-fKUBcc0rK8Vdqv5a/E3CSpMBLG1bzwv+Q0Q83F8fG2ZfNCNKGbcEYABdonNZkkx141Rj03cZQFCgxu3MVEGU+A==}
+  turbo-linux-64@2.3.3:
+    resolution: {integrity: sha512-eHj9OIB0dFaP6BxB88jSuaCLsOQSYWBgmhy2ErCu6D2GG6xW3b6e2UWHl/1Ho9FsTg4uVgo4DB9wGsKa5erjUA==}
     cpu: [x64]
     os: [linux]
 
-  turbo-linux-arm64@2.1.2:
-    resolution: {integrity: sha512-sV8Bpmm0WiuxgbhxymcC7wSsuxfBBieI98GegSwbr/bs1ANAgzCg93urIrdKdQ3/b31zZxQwcaP4FBF1wx1Qdg==}
+  turbo-linux-arm64@2.3.3:
+    resolution: {integrity: sha512-NmDE/NjZoDj1UWBhMtOPmqFLEBKhzGS61KObfrDEbXvU3lekwHeoPvAMfcovzswzch+kN2DrtbNIlz+/rp8OCg==}
     cpu: [arm64]
     os: [linux]
 
-  turbo-windows-64@2.1.2:
-    resolution: {integrity: sha512-wcmIJZI9ORT9ykHGliFE6kWRQrlH930QGSjSgWC8uFChFFuOyUlvC7ttcxuSvU9VqC7NF4C+GVAcFJQ8lTjN7g==}
+  turbo-windows-64@2.3.3:
+    resolution: {integrity: sha512-O2+BS4QqjK3dOERscXqv7N2GXNcqHr9hXumkMxDj/oGx9oCatIwnnwx34UmzodloSnJpgSqjl8iRWiY65SmYoQ==}
     cpu: [x64]
     os: [win32]
 
-  turbo-windows-arm64@2.1.2:
-    resolution: {integrity: sha512-zdnXjrhk7YO6CP+Q5wPueEvOCLH4lDa6C4rrwiakcWcPgcQGbVozJlo4uaQ6awo8HLWQEvOwu84RkWTdLAc/Hw==}
+  turbo-windows-arm64@2.3.3:
+    resolution: {integrity: sha512-dW4ZK1r6XLPNYLIKjC4o87HxYidtRRcBeo/hZ9Wng2XM/MqqYkAyzJXJGgRMsc0MMEN9z4+ZIfnSNBrA0b08ag==}
     cpu: [arm64]
     os: [win32]
 
-  turbo@2.1.2:
-    resolution: {integrity: sha512-Jb0rbU4iHEVQ18An/YfakdIv9rKnd3zUfSE117EngrfWXFHo3RndVH96US3GsT8VHpwTncPePDBT2t06PaFLrw==}
+  turbo@2.3.3:
+    resolution: {integrity: sha512-DUHWQAcC8BTiUZDRzAYGvpSpGLiaOQPfYXlCieQbwUvmml/LRGIe3raKdrOPOoiX0DYlzxs2nH6BoWJoZrj8hA==}
     hasBin: true
 
   tween-functions@1.2.0:
@@ -11748,8 +11766,8 @@ packages:
   typedi@0.10.0:
     resolution: {integrity: sha512-v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w==}
 
-  typescript@5.6.2:
-    resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==}
+  typescript@5.7.2:
+    resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -11977,7 +11995,7 @@ packages:
     resolution: {integrity: sha512-O5NalzHANQRwVw1xj8KQun3Bv8OSDAlNJXrnqoAz10BOuW8FVvY5g4ygj+DlJZL5mtSPuMu9vd3OfrdW5d4k6w==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
       vite: '*'
     peerDependenciesMeta:
       vite:
@@ -12017,7 +12035,7 @@ packages:
   vitest-mock-extended@2.0.2:
     resolution: {integrity: sha512-n3MBqVITKyclZ0n0y66hkT4UiiEYFQn9tteAnIxT0MPz1Z8nFcPUG3Cf0cZOyoPOj/cq6Ab1XFw2lM/qM5EDWQ==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
       vitest: '>=2.0.0'
 
   vitest@2.1.2:
@@ -12069,7 +12087,7 @@ packages:
   vue-component-meta@2.1.6:
     resolution: {integrity: sha512-N5zReatWQTNqULhatFib69K82g5UhDERVobeqrT5S6Uk2QoCeYbsSY8nHRUwJFywE2iXRFN4B+XPhI+piZfC6w==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       typescript:
         optional: true
@@ -12127,6 +12145,16 @@ packages:
     peerDependencies:
       vue: ^3.3.4
 
+  vue-observe-visibility@2.0.0-alpha.1:
+    resolution: {integrity: sha512-flFbp/gs9pZniXR6fans8smv1kDScJ8RS7rEpMjhVabiKeq7Qz3D9+eGsypncjfIyyU84saU88XZ0zjbD6Gq/g==}
+    peerDependencies:
+      vue: ^3.0.0
+
+  vue-resize@2.0.0-alpha.1:
+    resolution: {integrity: sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==}
+    peerDependencies:
+      vue: ^3.0.0
+
   vue-router@4.4.5:
     resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==}
     peerDependencies:
@@ -12136,7 +12164,12 @@ packages:
     resolution: {integrity: sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==}
     hasBin: true
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
+
+  vue-virtual-scroller@2.0.0-beta.8:
+    resolution: {integrity: sha512-b8/f5NQ5nIEBRTNi6GcPItE4s7kxNHw2AIHLtDp+2QvqdTjVN0FgONwX9cr53jWRgnu+HRLPaWDOR2JPI5MTfQ==}
+    peerDependencies:
+      vue: ^3.2.0
 
   vue3-touch-events@4.1.3:
     resolution: {integrity: sha512-uXTclRzn7de1mgiDIZ8N4J/wnWl1vBPLTWr60fqoLXu7ifhDKpl83Q2m9qA20KfEiAy+L4X/xXGc5ptGmdPh4A==}
@@ -12144,7 +12177,7 @@ packages:
   vue@3.5.11:
     resolution: {integrity: sha512-/8Wurrd9J3lb72FTQS7gRMNQD4nztTtKPmuDuPuhqXmmpD6+skVjAeahNpVzsuky6Sy9gy7wn8UadqPtt9SQIg==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       typescript:
         optional: true
@@ -13948,9 +13981,9 @@ snapshots:
       enabled: 2.0.0
       kuler: 2.0.0
 
-  '@element-plus/icons-vue@2.3.1(vue@3.5.11(typescript@5.6.2))':
+  '@element-plus/icons-vue@2.3.1(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
   '@emotion/is-prop-valid@1.2.1':
     dependencies:
@@ -14089,10 +14122,10 @@ snapshots:
     dependencies:
       '@fortawesome/fontawesome-common-types': 0.2.36
 
-  '@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.6.2))':
+  '@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.7.2))':
     dependencies:
       '@fortawesome/fontawesome-svg-core': 1.2.36
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
   '@gar/promisify@1.1.3':
     optional: true
@@ -14114,7 +14147,7 @@ snapshots:
     dependencies:
       '@supercharge/promise-pool': 3.1.0
       semver: 7.6.0
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   '@google-ai/generativelanguage@2.6.0(encoding@0.1.13)':
     dependencies:
@@ -14298,7 +14331,7 @@ snapshots:
       jest-util: 29.6.2
       slash: 3.0.0
 
-  '@jest/core@29.6.2(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))':
+  '@jest/core@29.6.2(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
     dependencies:
       '@jest/console': 29.6.2
       '@jest/reporters': 29.6.2
@@ -14312,7 +14345,7 @@ snapshots:
       exit: 0.1.2
       graceful-fs: 4.2.11
       jest-changed-files: 29.5.0
-      jest-config: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+      jest-config: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       jest-haste-map: 29.6.2
       jest-message-util: 29.6.2
       jest-regex-util: 29.4.3
@@ -14573,7 +14606,7 @@ snapshots:
       - aws-crt
       - encoding
 
-  '@langchain/community@0.3.11(simkpjwqw7qnwbripe37u5qu7a)':
+  '@langchain/community@0.3.11(ndajhtzj4xqxxpqz4t56suvqri)':
     dependencies:
       '@ibm-cloud/watsonx-ai': 1.1.2
       '@langchain/core': 0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8))
@@ -14603,13 +14636,13 @@ snapshots:
       '@huggingface/inference': 2.8.0
       '@mozilla/readability': 0.5.0
       '@pinecone-database/pinecone': 3.0.3
-      '@qdrant/js-client-rest': 1.11.0(typescript@5.6.2)
+      '@qdrant/js-client-rest': 1.11.0(typescript@5.7.2)
       '@smithy/eventstream-codec': 2.2.0
       '@smithy/protocol-http': 3.3.0
       '@smithy/signature-v4': 2.2.1
       '@smithy/util-utf8': 2.3.0
       '@supabase/supabase-js': 2.45.4
-      '@xata.io/client': 0.28.4(typescript@5.6.2)
+      '@xata.io/client': 0.28.4(typescript@5.7.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
@@ -14740,10 +14773,10 @@ snapshots:
       flat: 5.0.2
       uuid: 10.0.0
 
-  '@langchain/qdrant@0.1.0(@langchain/core@0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8)))(typescript@5.6.2)':
+  '@langchain/qdrant@0.1.0(@langchain/core@0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8)))(typescript@5.7.2)':
     dependencies:
       '@langchain/core': 0.3.15(openai@4.69.0(encoding@0.1.13)(zod@3.23.8))
-      '@qdrant/js-client-rest': 1.11.0(typescript@5.6.2)
+      '@qdrant/js-client-rest': 1.11.0(typescript@5.7.2)
       uuid: 10.0.0
     transitivePeerDependencies:
       - typescript
@@ -14829,7 +14862,7 @@ snapshots:
       resolve: 1.22.8
       semver: 7.6.0
       source-map: 0.6.1
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - '@types/node'
 
@@ -14905,7 +14938,7 @@ snapshots:
       esprima-next: 5.8.4
       recast: 0.22.0
 
-  '@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))':
+  '@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.7.2))':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -14932,11 +14965,11 @@ snapshots:
       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)
+      ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@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))':
+  '@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.7.2))':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -14963,7 +14996,7 @@ snapshots:
       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)
+      ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
 
@@ -15069,10 +15102,10 @@ snapshots:
     dependencies:
       encoding: 0.1.13
 
-  '@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))':
+  '@pinia/testing@0.1.6(pinia@2.2.4(typescript@5.7.2)(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      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))
+      pinia: 2.2.4(typescript@5.7.2)(vue@3.5.11(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -15103,11 +15136,11 @@ snapshots:
 
   '@protobufjs/utf8@1.1.0': {}
 
-  '@qdrant/js-client-rest@1.11.0(typescript@5.6.2)':
+  '@qdrant/js-client-rest@1.11.0(typescript@5.7.2)':
     dependencies:
       '@qdrant/openapi-typescript-fetch': 1.2.6
       '@sevinf/maybe': 0.5.0
-      typescript: 5.6.2
+      typescript: 5.7.2
       undici: 5.28.4
 
   '@qdrant/openapi-typescript-fetch@1.2.6': {}
@@ -15415,13 +15448,13 @@ snapshots:
     dependencies:
       '@sentry/types': 8.33.1
 
-  '@sentry/vue@8.33.1(vue@3.5.11(typescript@5.6.2))':
+  '@sentry/vue@8.33.1(vue@3.5.11(typescript@5.7.2))':
     dependencies:
       '@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)
+      vue: 3.5.11(typescript@5.7.2)
 
   '@sevinf/maybe@0.5.0': {}
 
@@ -16034,7 +16067,7 @@ snapshots:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@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/builder-vite@8.3.5(storybook@8.3.5)(typescript@5.7.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
       '@storybook/csf-plugin': 8.3.5(storybook@8.3.5)
       '@types/find-cache-dir': 3.2.1
@@ -16048,7 +16081,7 @@ snapshots:
       ts-dedent: 2.2.0
       vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
@@ -16130,24 +16163,24 @@ snapshots:
     dependencies:
       storybook: 8.3.5
 
-  '@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))':
+  '@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.7.2))':
     dependencies:
-      '@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))
+      '@storybook/builder-vite': 8.3.5(storybook@8.3.5)(typescript@5.7.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.7.2))
       find-package-json: 1.2.0
       magic-string: 0.30.11
       storybook: 8.3.5
-      typescript: 5.6.2
+      typescript: 5.7.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))
+      vue-component-meta: 2.1.6(typescript@5.7.2)
+      vue-docgen-api: 4.76.0(vue@3.5.11(typescript@5.7.2))
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - supports-color
       - vite-plugin-glimmerx
       - vue
 
-  '@storybook/vue3@8.3.5(storybook@8.3.5)(vue@3.5.11(typescript@5.6.2))':
+  '@storybook/vue3@8.3.5(storybook@8.3.5)(vue@3.5.11(typescript@5.7.2))':
     dependencies:
       '@storybook/components': 8.3.5(storybook@8.3.5)
       '@storybook/global': 5.0.0
@@ -16158,7 +16191,7 @@ snapshots:
       storybook: 8.3.5
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
       vue-component-type-helpers: 2.1.10
 
   '@supabase/auth-js@2.65.0':
@@ -16253,12 +16286,12 @@ snapshots:
     dependencies:
       '@testing-library/dom': 10.4.0
 
-  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.5.11)(vue@3.5.11(typescript@5.6.2))':
+  '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.5.11)(vue@3.5.11(typescript@5.7.2))':
     dependencies:
       '@babel/runtime': 7.24.7
       '@testing-library/dom': 9.3.3
       '@vue/test-utils': 2.4.6
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
     optionalDependencies:
       '@vue/compiler-sfc': 3.5.11
 
@@ -16762,13 +16795,13 @@ snapshots:
       '@types/node': 18.16.16
     optional: true
 
-  '@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
       '@eslint-community/regexpp': 4.6.2
-      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
       '@typescript-eslint/scope-manager': 7.2.0
-      '@typescript-eslint/type-utils': 7.2.0(eslint@8.57.0)(typescript@5.6.2)
-      '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/type-utils': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
+      '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
       '@typescript-eslint/visitor-keys': 7.2.0
       debug: 4.3.4
       eslint: 8.57.0
@@ -16776,22 +16809,22 @@ snapshots:
       ignore: 5.2.4
       natural-compare: 1.4.0
       semver: 7.6.0
-      ts-api-utils: 1.0.1(typescript@5.6.2)
+      ts-api-utils: 1.0.1(typescript@5.7.2)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
       '@typescript-eslint/scope-manager': 7.2.0
       '@typescript-eslint/types': 7.2.0
-      '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.6.2)
+      '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.7.2)
       '@typescript-eslint/visitor-keys': 7.2.0
       debug: 4.3.4
       eslint: 8.57.0
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
@@ -16805,15 +16838,15 @@ snapshots:
       '@typescript-eslint/types': 7.2.0
       '@typescript-eslint/visitor-keys': 7.2.0
 
-  '@typescript-eslint/type-utils@7.2.0(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/type-utils@7.2.0(eslint@8.57.0)(typescript@5.7.2)':
     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)
+      '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.7.2)
+      '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
       debug: 4.3.7
       eslint: 8.57.0
-      ts-api-utils: 1.0.1(typescript@5.6.2)
+      ts-api-utils: 1.0.1(typescript@5.7.2)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
@@ -16821,7 +16854,7 @@ snapshots:
 
   '@typescript-eslint/types@7.2.0': {}
 
-  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.6.2)':
+  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.7.2)':
     dependencies:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
@@ -16830,13 +16863,13 @@ snapshots:
       is-glob: 4.0.3
       minimatch: 9.0.3
       semver: 7.6.0
-      ts-api-utils: 1.0.1(typescript@5.6.2)
+      ts-api-utils: 1.0.1(typescript@5.7.2)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@7.2.0(typescript@5.6.2)':
+  '@typescript-eslint/typescript-estree@7.2.0(typescript@5.7.2)':
     dependencies:
       '@typescript-eslint/types': 7.2.0
       '@typescript-eslint/visitor-keys': 7.2.0
@@ -16845,34 +16878,34 @@ snapshots:
       is-glob: 4.0.3
       minimatch: 9.0.3
       semver: 7.6.0
-      ts-api-utils: 1.0.1(typescript@5.6.2)
+      ts-api-utils: 1.0.1(typescript@5.7.2)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
       '@types/json-schema': 7.0.15
       '@types/semver': 7.5.0
       '@typescript-eslint/scope-manager': 6.21.0
       '@typescript-eslint/types': 6.21.0
-      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.2)
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.7.2)
       eslint: 8.57.0
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@7.2.0(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/utils@7.2.0(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
       '@types/json-schema': 7.0.15
       '@types/semver': 7.5.0
       '@typescript-eslint/scope-manager': 7.2.0
       '@typescript-eslint/types': 7.2.0
-      '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.6.2)
+      '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.7.2)
       eslint: 8.57.0
       semver: 7.6.0
     transitivePeerDependencies:
@@ -16891,10 +16924,10 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@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))':
+  '@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.7.2))':
     dependencies:
       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)
+      vue: 3.5.11(typescript@5.7.2)
 
   '@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:
@@ -16988,39 +17021,39 @@ snapshots:
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
-  '@vue-flow/background@1.3.1(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/background@1.3.1(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.4(vue@3.5.11(typescript@5.6.2))
-      vue: 3.5.11(typescript@5.6.2)
+      '@vue-flow/core': 1.41.4(vue@3.5.11(typescript@5.7.2))
+      vue: 3.5.11(typescript@5.7.2)
 
-  '@vue-flow/controls@1.1.2(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/controls@1.1.2(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.4(vue@3.5.11(typescript@5.6.2))
-      vue: 3.5.11(typescript@5.6.2)
+      '@vue-flow/core': 1.41.4(vue@3.5.11(typescript@5.7.2))
+      vue: 3.5.11(typescript@5.7.2)
 
-  '@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      '@vueuse/core': 10.11.0(vue@3.5.11(typescript@5.6.2))
+      '@vueuse/core': 10.11.0(vue@3.5.11(typescript@5.7.2))
       d3-drag: 3.0.0
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
-  '@vue-flow/minimap@1.5.0(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/minimap@1.5.0(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.4(vue@3.5.11(typescript@5.6.2))
+      '@vue-flow/core': 1.41.4(vue@3.5.11(typescript@5.7.2))
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.41.4(vue@3.5.11(typescript@5.7.2)))(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.4(vue@3.5.11(typescript@5.6.2))
+      '@vue-flow/core': 1.41.4(vue@3.5.11(typescript@5.7.2))
       d3-drag: 3.0.0
       d3-selection: 3.0.0
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
   '@vue/compiler-core@3.5.11':
     dependencies:
@@ -17061,19 +17094,19 @@ snapshots:
 
   '@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)':
+  '@vue/eslint-config-typescript@13.0.0(eslint-plugin-vue@9.23.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
-      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2)
-      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
       eslint: 8.57.0
       eslint-plugin-vue: 9.23.0(eslint@8.57.0)
       vue-eslint-parser: 9.4.2(eslint@8.57.0)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
-  '@vue/language-core@2.1.6(typescript@5.6.2)':
+  '@vue/language-core@2.1.6(typescript@5.7.2)':
     dependencies:
       '@volar/language-core': 2.4.6
       '@vue/compiler-dom': 3.5.11
@@ -17084,7 +17117,7 @@ snapshots:
       muggle-string: 0.4.1
       path-browserify: 1.0.1
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   '@vue/reactivity@3.5.11':
     dependencies:
@@ -17102,11 +17135,11 @@ snapshots:
       '@vue/shared': 3.5.11
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.11(vue@3.5.11(typescript@5.6.2))':
+  '@vue/server-renderer@3.5.11(vue@3.5.11(typescript@5.7.2))':
     dependencies:
       '@vue/compiler-ssr': 3.5.11
       '@vue/shared': 3.5.11
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
   '@vue/shared@3.5.11': {}
 
@@ -17115,31 +17148,31 @@ snapshots:
       js-beautify: 1.14.9
       vue-component-type-helpers: 2.1.10
 
-  '@vueuse/components@10.11.0(vue@3.5.11(typescript@5.6.2))':
+  '@vueuse/components@10.11.0(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      '@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))
+      '@vueuse/core': 10.11.0(vue@3.5.11(typescript@5.7.2))
+      '@vueuse/shared': 10.11.0(vue@3.5.11(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/core@10.11.0(vue@3.5.11(typescript@5.6.2))':
+  '@vueuse/core@10.11.0(vue@3.5.11(typescript@5.7.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.11.0
-      '@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))
+      '@vueuse/shared': 10.11.0(vue@3.5.11(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/core@9.13.0(vue@3.5.11(typescript@5.6.2))':
+  '@vueuse/core@9.13.0(vue@3.5.11(typescript@5.7.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.16
       '@vueuse/metadata': 9.13.0
-      '@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))
+      '@vueuse/shared': 9.13.0(vue@3.5.11(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -17148,25 +17181,25 @@ snapshots:
 
   '@vueuse/metadata@9.13.0': {}
 
-  '@vueuse/shared@10.11.0(vue@3.5.11(typescript@5.6.2))':
+  '@vueuse/shared@10.11.0(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/shared@9.13.0(vue@3.5.11(typescript@5.6.2))':
+  '@vueuse/shared@9.13.0(vue@3.5.11(typescript@5.7.2))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
   '@vvo/tzdb@6.141.0': {}
 
-  '@xata.io/client@0.28.4(typescript@5.6.2)':
+  '@xata.io/client@0.28.4(typescript@5.7.2)':
     dependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   '@xmldom/xmldom@0.8.6': {}
 
@@ -17741,7 +17774,7 @@ snapshots:
     dependencies:
       node-int64: 0.4.0
 
-  bson@6.8.0: {}
+  bson@6.10.0: {}
 
   buffer-crc32@0.2.13: {}
 
@@ -18822,15 +18855,15 @@ snapshots:
 
   electron-to-chromium@1.4.703: {}
 
-  element-plus@2.4.3(vue@3.5.11(typescript@5.6.2)):
+  element-plus@2.4.3(vue@3.5.11(typescript@5.7.2)):
     dependencies:
       '@ctrl/tinycolor': 3.6.0
-      '@element-plus/icons-vue': 2.3.1(vue@3.5.11(typescript@5.6.2))
+      '@element-plus/icons-vue': 2.3.1(vue@3.5.11(typescript@5.7.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.5.11(typescript@5.6.2))
+      '@vueuse/core': 9.13.0(vue@3.5.11(typescript@5.7.2))
       async-validator: 4.2.5
       dayjs: 1.11.10
       escape-html: 1.0.3
@@ -18839,7 +18872,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.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
@@ -19199,21 +19232,21 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0):
+  eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       confusing-browser-globals: 1.0.11
       eslint: 8.57.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       object.assign: 4.1.5
       object.entries: 1.1.5
       semver: 7.6.0
 
-  eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0):
+  eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2)
-      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
       eslint: 8.57.0
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0)
     transitivePeerDependencies:
       - eslint-plugin-import
 
@@ -19231,13 +19264,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  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-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0):
     dependencies:
       debug: 4.3.4
       enhanced-resolve: 5.13.0
       eslint: 8.57.0
-      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)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.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.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       fast-glob: 3.3.2
       get-tsconfig: 4.5.0
       is-core-module: 2.13.1
@@ -19248,14 +19281,14 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  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):
+  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.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.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       debug: 3.2.7(supports-color@5.5.0)
     optionalDependencies:
-      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
       eslint: 8.57.0
       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-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -19264,7 +19297,7 @@ snapshots:
       eslint: 8.57.0
       globals: 13.20.0
 
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
     dependencies:
       array-includes: 3.1.7
       array.prototype.findlastindex: 1.2.3
@@ -19274,7 +19307,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      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)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.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.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -19285,7 +19318,7 @@ snapshots:
       semver: 7.6.0
       tsconfig-paths: 4.2.0
     optionalDependencies:
-      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
@@ -19300,9 +19333,9 @@ snapshots:
 
   eslint-plugin-n8n-local-rules@1.0.0: {}
 
-  eslint-plugin-n8n-nodes-base@1.16.3(eslint@8.57.0)(typescript@5.6.2):
+  eslint-plugin-n8n-nodes-base@1.16.3(eslint@8.57.0)(typescript@5.7.2):
     dependencies:
-      '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.7.2)
       camel-case: 4.1.2
       eslint-plugin-local: 1.0.0
       indefinite: 2.5.1
@@ -19337,12 +19370,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-unused-imports@3.1.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0):
+  eslint-plugin-unused-imports@3.1.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0):
     dependencies:
       eslint: 8.57.0
       eslint-rule-composer: 0.3.0
     optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)
 
   eslint-plugin-vue@9.23.0(eslint@8.57.0):
     dependencies:
@@ -20523,7 +20556,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ip@2.0.1:
+  ip-address@9.0.5:
+    dependencies:
+      jsbn: 1.1.0
+      sprintf-js: 1.1.3
     optional: true
 
   ipaddr.js@1.9.1: {}
@@ -20794,16 +20830,16 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
-  jest-cli@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)):
+  jest-cli@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
     dependencies:
-      '@jest/core': 29.6.2(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+      '@jest/core': 29.6.2(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       '@jest/test-result': 29.6.2
       '@jest/types': 29.6.1
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
       import-local: 3.1.0
-      jest-config: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+      jest-config: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       jest-util: 29.6.2
       jest-validate: 29.6.2
       prompts: 2.4.2
@@ -20814,7 +20850,7 @@ snapshots:
       - supports-color
       - ts-node
 
-  jest-config@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)):
+  jest-config@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
     dependencies:
       '@babel/core': 7.24.0
       '@jest/test-sequencer': 29.6.2
@@ -20840,7 +20876,7 @@ snapshots:
       strip-json-comments: 3.1.1
     optionalDependencies:
       '@types/node': 18.16.16
-      ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.6.2)
+      ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.7.2)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -20958,11 +20994,11 @@ snapshots:
       slash: 3.0.0
       stack-utils: 2.0.6
 
-  jest-mock-extended@3.0.4(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)))(typescript@5.6.2):
+  jest-mock-extended@3.0.4(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)))(typescript@5.7.2):
     dependencies:
-      jest: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
-      ts-essentials: 7.0.3(typescript@5.6.2)
-      typescript: 5.6.2
+      jest: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
+      ts-essentials: 7.0.3(typescript@5.7.2)
+      typescript: 5.7.2
 
   jest-mock@29.6.2:
     dependencies:
@@ -21118,12 +21154,12 @@ snapshots:
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)):
+  jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
     dependencies:
-      '@jest/core': 29.6.2(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+      '@jest/core': 29.6.2(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       '@jest/types': 29.6.1
       import-local: 3.1.0
-      jest-cli: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+      jest-cli: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -21184,6 +21220,9 @@ snapshots:
 
   jsbn@0.1.1: {}
 
+  jsbn@1.1.0:
+    optional: true
+
   jsdoc-type-pratt-parser@4.1.0: {}
 
   jsdom@20.0.2:
@@ -21227,7 +21266,7 @@ snapshots:
       form-data: 4.0.0
       html-encoding-sniffer: 4.0.0
       http-proxy-agent: 7.0.0
-      https-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.5
       is-potential-custom-element-name: 1.0.1
       nwsapi: 2.2.7
       parse5: 7.1.2
@@ -21935,6 +21974,8 @@ snapshots:
       lodash: 4.17.21
       pretender: 3.4.7
 
+  mitt@2.1.0: {}
+
   mjml-accordion@4.15.3(encoding@0.1.13):
     dependencies:
       '@babel/runtime': 7.24.7
@@ -22285,15 +22326,15 @@ snapshots:
       '@types/whatwg-url': 11.0.4
       whatwg-url: 13.0.0
 
-  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):
+  mongodb@6.11.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.8.3):
     dependencies:
       '@mongodb-js/saslprep': 1.1.9
-      bson: 6.8.0
+      bson: 6.10.0
       mongodb-connection-string-url: 3.0.0
     optionalDependencies:
       '@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
+      socks: 2.8.3
 
   moo@0.5.2: {}
 
@@ -23022,13 +23063,13 @@ snapshots:
 
   pify@2.3.0: {}
 
-  pinia@2.2.4(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)):
+  pinia@2.2.4(typescript@5.7.2)(vue@3.5.11(typescript@5.7.2)):
     dependencies:
       '@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))
+      vue: 3.5.11(typescript@5.7.2)
+      vue-demi: 0.14.10(vue@3.5.11(typescript@5.7.2))
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   pirates@4.0.6: {}
 
@@ -23076,13 +23117,13 @@ snapshots:
       camelcase-css: 2.0.1
       postcss: 8.4.38
 
-  postcss-load-config@4.0.2(postcss@8.4.38)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)):
+  postcss-load-config@4.0.2(postcss@8.4.38)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
     dependencies:
       lilconfig: 3.1.2
       yaml: 2.3.4
     optionalDependencies:
       postcss: 8.4.38
-      ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.6.2)
+      ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.7.2)
 
   postcss-nested@6.0.1(postcss@8.4.38):
     dependencies:
@@ -23364,9 +23405,9 @@ snapshots:
     dependencies:
       long: 4.0.0
 
-  qrcode.vue@3.3.4(vue@3.5.11(typescript@5.6.2)):
+  qrcode.vue@3.3.4(vue@3.5.11(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
   qs@6.10.4:
     dependencies:
@@ -23905,7 +23946,7 @@ snapshots:
     dependencies:
       chokidar: 4.0.1
       immutable: 4.2.2
-      source-map-js: 1.0.2
+      source-map-js: 1.2.1
 
   sax@1.2.4: {}
 
@@ -24176,19 +24217,17 @@ snapshots:
     dependencies:
       agent-base: 6.0.2
       debug: 4.3.7
-      socks: 2.7.1
+      socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
     optional: true
 
-  socks@2.7.1:
+  socks@2.8.3:
     dependencies:
-      ip: 2.0.1
+      ip-address: 9.0.5
       smart-buffer: 4.2.0
     optional: true
 
-  source-map-js@1.0.2: {}
-
   source-map-js@1.2.0: {}
 
   source-map-js@1.2.1: {}
@@ -24241,6 +24280,9 @@ snapshots:
 
   sprintf-js@1.1.2: {}
 
+  sprintf-js@1.1.3:
+    optional: true
+
   sqlite3@5.1.7:
     dependencies:
       bindings: 1.5.0
@@ -24566,7 +24608,7 @@ snapshots:
 
   syslog-client@1.1.1: {}
 
-  tailwindcss@3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)):
+  tailwindcss@3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -24585,7 +24627,7 @@ snapshots:
       postcss: 8.4.38
       postcss-import: 15.1.0(postcss@8.4.38)
       postcss-js: 4.0.1(postcss@8.4.38)
-      postcss-load-config: 4.0.2(postcss@8.4.38)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+      postcss-load-config: 4.0.2(postcss@8.4.38)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       postcss-nested: 6.0.1(postcss@8.4.38)
       postcss-selector-parser: 6.0.16
       resolve: 1.22.8
@@ -24787,19 +24829,19 @@ snapshots:
 
   triple-beam@1.3.0: {}
 
-  ts-api-utils@1.0.1(typescript@5.6.2):
+  ts-api-utils@1.0.1(typescript@5.7.2):
     dependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   ts-dedent@2.2.0: {}
 
-  ts-essentials@10.0.2(typescript@5.6.2):
+  ts-essentials@10.0.2(typescript@5.7.2):
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  ts-essentials@7.0.3(typescript@5.6.2):
+  ts-essentials@7.0.3(typescript@5.7.2):
     dependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   ts-ics@1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.23.8):
     dependencies:
@@ -24810,17 +24852,17 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
-  ts-jest@29.1.1(@babel/core@7.24.0)(@jest/types@29.6.1)(babel-jest@29.6.2(@babel/core@7.24.0))(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)))(typescript@5.6.2):
+  ts-jest@29.1.1(@babel/core@7.24.0)(@jest/types@29.6.1)(babel-jest@29.6.2(@babel/core@7.24.0))(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)))(typescript@5.7.2):
     dependencies:
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
-      jest: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2))
+      jest: 29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       jest-util: 29.5.0
       json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
       semver: 7.6.0
-      typescript: 5.6.2
+      typescript: 5.7.2
       yargs-parser: 21.1.1
     optionalDependencies:
       '@babel/core': 7.24.0
@@ -24829,7 +24871,7 @@ snapshots:
 
   ts-map@1.0.3: {}
 
-  ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2):
+  ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
@@ -24843,7 +24885,7 @@ snapshots:
       create-require: 1.1.1
       diff: 4.0.2
       make-error: 1.3.6
-      typescript: 5.6.2
+      typescript: 5.7.2
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
     optional: true
@@ -24866,13 +24908,13 @@ snapshots:
       normalize-path: 3.0.0
       plimit-lit: 1.4.1
 
-  tsc-watch@6.2.0(typescript@5.6.2):
+  tsc-watch@6.2.0(typescript@5.7.2):
     dependencies:
       cross-spawn: 7.0.6
       node-cleanup: 2.1.2
       ps-tree: 1.2.0
       string-argv: 0.3.1
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   tsconfig-paths@4.2.0:
     dependencies:
@@ -24890,32 +24932,32 @@ snapshots:
 
   tunnel@0.0.6: {}
 
-  turbo-darwin-64@2.1.2:
+  turbo-darwin-64@2.3.3:
     optional: true
 
-  turbo-darwin-arm64@2.1.2:
+  turbo-darwin-arm64@2.3.3:
     optional: true
 
-  turbo-linux-64@2.1.2:
+  turbo-linux-64@2.3.3:
     optional: true
 
-  turbo-linux-arm64@2.1.2:
+  turbo-linux-arm64@2.3.3:
     optional: true
 
-  turbo-windows-64@2.1.2:
+  turbo-windows-64@2.3.3:
     optional: true
 
-  turbo-windows-arm64@2.1.2:
+  turbo-windows-arm64@2.3.3:
     optional: true
 
-  turbo@2.1.2:
+  turbo@2.3.3:
     optionalDependencies:
-      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
+      turbo-darwin-64: 2.3.3
+      turbo-darwin-arm64: 2.3.3
+      turbo-linux-64: 2.3.3
+      turbo-linux-arm64: 2.3.3
+      turbo-windows-64: 2.3.3
+      turbo-windows-arm64: 2.3.3
 
   tween-functions@1.2.0: {}
 
@@ -25028,7 +25070,7 @@ snapshots:
 
   typedi@0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe): {}
 
-  typescript@5.6.2: {}
+  typescript@5.7.2: {}
 
   uc.micro@1.0.6: {}
 
@@ -25110,7 +25152,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  unplugin-vue-components@0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.11(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.7.2)):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.24.0)
@@ -25122,7 +25164,7 @@ snapshots:
       minimatch: 9.0.5
       mlly: 1.7.1
       unplugin: 1.11.0
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
     optionalDependencies:
       '@babel/parser': 7.25.6
     transitivePeerDependencies:
@@ -25248,18 +25290,18 @@ snapshots:
       - supports-color
       - terser
 
-  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)):
+  vite-plugin-dts@4.2.3(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.7.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)):
     dependencies:
       '@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)
+      '@vue/language-core': 2.1.6(typescript@5.7.2)
       compare-versions: 6.1.1
       debug: 4.3.7
       kolorist: 1.8.0
       local-pkg: 0.5.0
       magic-string: 0.30.11
-      typescript: 5.6.2
+      typescript: 5.7.2
     optionalDependencies:
       vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
@@ -25278,10 +25320,10 @@ snapshots:
       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)):
+  vitest-mock-extended@2.0.2(typescript@5.7.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
+      ts-essentials: 10.0.2(typescript@5.7.2)
+      typescript: 5.7.2
       vitest: 2.1.2(@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):
@@ -25328,33 +25370,33 @@ snapshots:
       lodash.orderby: 4.6.0
       lodash.throttle: 4.1.1
 
-  vue-boring-avatars@1.3.0(vue@3.5.11(typescript@5.6.2)):
+  vue-boring-avatars@1.3.0(vue@3.5.11(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  vue-chartjs@5.2.0(chart.js@4.4.0)(vue@3.5.11(typescript@5.6.2)):
+  vue-chartjs@5.2.0(chart.js@4.4.0)(vue@3.5.11(typescript@5.7.2)):
     dependencies:
       chart.js: 4.4.0
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  vue-component-meta@2.1.6(typescript@5.6.2):
+  vue-component-meta@2.1.6(typescript@5.7.2):
     dependencies:
       '@volar/typescript': 2.4.6
-      '@vue/language-core': 2.1.6(typescript@5.6.2)
+      '@vue/language-core': 2.1.6(typescript@5.7.2)
       path-browserify: 1.0.1
       vue-component-type-helpers: 2.1.6
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   vue-component-type-helpers@2.1.10: {}
 
   vue-component-type-helpers@2.1.6: {}
 
-  vue-demi@0.14.10(vue@3.5.11(typescript@5.6.2)):
+  vue-demi@0.14.10(vue@3.5.11(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  vue-docgen-api@4.76.0(vue@3.5.11(typescript@5.6.2)):
+  vue-docgen-api@4.76.0(vue@3.5.11(typescript@5.7.2)):
     dependencies:
       '@babel/parser': 7.25.6
       '@babel/types': 7.25.6
@@ -25367,8 +25409,8 @@ snapshots:
       pug: 3.0.3
       recast: 0.23.6
       ts-map: 1.0.3
-      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: 3.5.11(typescript@5.7.2)
+      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.5.11(typescript@5.7.2))
 
   vue-eslint-parser@9.4.2(eslint@8.57.0):
     dependencies:
@@ -25387,50 +25429,65 @@ snapshots:
     dependencies:
       github-buttons: 2.29.1
 
-  vue-i18n@9.2.2(vue@3.5.11(typescript@5.6.2)):
+  vue-i18n@9.2.2(vue@3.5.11(typescript@5.7.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.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.5.11(typescript@5.6.2)):
+  vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.5.11(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  vue-json-pretty@2.2.4(vue@3.5.11(typescript@5.6.2)):
+  vue-json-pretty@2.2.4(vue@3.5.11(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  vue-markdown-render@2.2.1(vue@3.5.11(typescript@5.6.2)):
+  vue-markdown-render@2.2.1(vue@3.5.11(typescript@5.7.2)):
     dependencies:
       markdown-it: 13.0.2
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  vue-router@4.4.5(vue@3.5.11(typescript@5.6.2)):
+  vue-observe-visibility@2.0.0-alpha.1(vue@3.5.11(typescript@5.7.2)):
+    dependencies:
+      vue: 3.5.11(typescript@5.7.2)
+
+  vue-resize@2.0.0-alpha.1(vue@3.5.11(typescript@5.7.2)):
+    dependencies:
+      vue: 3.5.11(typescript@5.7.2)
+
+  vue-router@4.4.5(vue@3.5.11(typescript@5.7.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.11(typescript@5.7.2)
 
-  vue-tsc@2.1.6(typescript@5.6.2):
+  vue-tsc@2.1.6(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2):
     dependencies:
       '@volar/typescript': 2.4.6
-      '@vue/language-core': 2.1.6(typescript@5.6.2)
+      '@vue/language-core': 2.1.6(typescript@5.7.2)
       semver: 7.6.0
-      typescript: 5.6.2
+      typescript: 5.7.2
+
+  vue-virtual-scroller@2.0.0-beta.8(vue@3.5.11(typescript@5.7.2)):
+    dependencies:
+      mitt: 2.1.0
+      vue: 3.5.11(typescript@5.7.2)
+      vue-observe-visibility: 2.0.0-alpha.1(vue@3.5.11(typescript@5.7.2))
+      vue-resize: 2.0.0-alpha.1(vue@3.5.11(typescript@5.7.2))
 
   vue3-touch-events@4.1.3: {}
 
-  vue@3.5.11(typescript@5.6.2):
+  vue@3.5.11(typescript@5.7.2):
     dependencies:
       '@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/server-renderer': 3.5.11(vue@3.5.11(typescript@5.7.2))
       '@vue/shared': 3.5.11
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   w3c-keyname@2.2.6: {}
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 8b692007af..306d776861 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -18,6 +18,7 @@ catalog:
   fast-glob: 3.2.12
   flatted: 3.2.7
   form-data: 4.0.0
+  iconv-lite: 0.6.3
   lodash: 4.17.21
   luxon: 3.4.4
   nanoid: 3.3.6